From 67d9d4d48711932f1d6fdf19ccc35988702e2290 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Tue, 26 May 2020 14:59:31 +0200 Subject: [PATCH 01/16] Fix 'full_core' system test Change-Id: I9bd5831f134141546fe435b9042b87a13ed39c1b --- tests/system/full_core/full_core.sh.template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/system/full_core/full_core.sh.template b/tests/system/full_core/full_core.sh.template index df74f75..5d5595f 100755 --- a/tests/system/full_core/full_core.sh.template +++ b/tests/system/full_core/full_core.sh.template @@ -12,26 +12,22 @@ clean_crash_dump MINICOREDUMPER_DIR=/etc/minicoredumper/ CONFIG_FILE=${MINICOREDUMPER_DIR}/generic.recept.json -DOTNET_CONFIG_FILE=${MINICOREDUMPER_DIR}/dotnet.recept.json +ORIG_CONFIG_FILE=$(readlink ${CONFIG_FILE}) +FULLCORE_CONFIG_FILE=${MINICOREDUMPER_DIR}/generic-fullcore.recept.json BACKUP_CONFIG_FILE=/tmp/generic.recept.json -function backup_config { - cp ${CONFIG_FILE} ${BACKUP_CONFIG_FILE} -} - function modify_config { - cp ${DOTNET_CONFIG_FILE} ${CONFIG_FILE} + ln -sf ${FULLCORE_CONFIG_FILE} ${CONFIG_FILE} } function restore { - cp ${BACKUP_CONFIG_FILE} ${CONFIG_FILE} + ln -sf ${ORIG_CONFIG_FILE} ${CONFIG_FILE} popd } trap restore 0 pushd ${CRASH_DUMP_PATH} -backup_config modify_config { -- 2.7.4 From edfabff0a4a766b6812239209f94d80defb23dd0 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Fri, 22 May 2020 16:30:16 +0200 Subject: [PATCH 02/16] Release 6.0.18 This release brings option that allows to specify whether the process is to be released as soon as all the necessary data has been read or only after the entire report has been created. Change-Id: Icb2cab7884966505a26c97aa86745721252b6bb7 --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 1f4363d..13cf133 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 6.0.17 +Version: 6.0.18 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From 1fcb408fb7a1373d9519389f8414b80e28b31d83 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Tue, 30 Jun 2020 10:47:26 +0200 Subject: [PATCH 03/16] Change the way ELF file are parsed Change-Id: I737ec17f8a5a6e71efe24f7f44ad1e08775d24b7 --- src/crash-stack/dwarf.h | 652 ++++++++++++++++++++++++++++++++++++++++++ src/crash-stack/unwind.c | 73 ++--- src/livedumper/CMakeLists.txt | 2 +- src/livedumper/core.hpp | 17 +- src/shared/elf_helpers.h | 209 ++++++++++++++ 5 files changed, 900 insertions(+), 53 deletions(-) create mode 100644 src/crash-stack/dwarf.h create mode 100644 src/shared/elf_helpers.h diff --git a/src/crash-stack/dwarf.h b/src/crash-stack/dwarf.h new file mode 100644 index 0000000..8f37335 --- /dev/null +++ b/src/crash-stack/dwarf.h @@ -0,0 +1,652 @@ +/*- + * Copyright (c) 2007 John Birrell (jb@freebsd.org) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED.IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id: dwarf.h 3749 2019-06-28 01:10:44Z emaste $ + */ + +#ifndef _DWARF_H_ +#define _DWARF_H_ + +#define DW_TAG_array_type 0x01 +#define DW_TAG_class_type 0x02 +#define DW_TAG_entry_point 0x03 +#define DW_TAG_enumeration_type 0x04 +#define DW_TAG_formal_parameter 0x05 +#define DW_TAG_imported_declaration 0x08 +#define DW_TAG_label 0x0a +#define DW_TAG_lexical_block 0x0b +#define DW_TAG_member 0x0d +#define DW_TAG_pointer_type 0x0f +#define DW_TAG_reference_type 0x10 +#define DW_TAG_compile_unit 0x11 +#define DW_TAG_string_type 0x12 +#define DW_TAG_structure_type 0x13 +#define DW_TAG_subroutine_type 0x15 +#define DW_TAG_typedef 0x16 +#define DW_TAG_union_type 0x17 +#define DW_TAG_unspecified_parameters 0x18 +#define DW_TAG_variant 0x19 +#define DW_TAG_common_block 0x1a +#define DW_TAG_common_inclusion 0x1b +#define DW_TAG_inheritance 0x1c +#define DW_TAG_inlined_subroutine 0x1d +#define DW_TAG_module 0x1e +#define DW_TAG_ptr_to_member_type 0x1f +#define DW_TAG_set_type 0x20 +#define DW_TAG_subrange_type 0x21 +#define DW_TAG_with_stmt 0x22 +#define DW_TAG_access_declaration 0x23 +#define DW_TAG_base_type 0x24 +#define DW_TAG_catch_block 0x25 +#define DW_TAG_const_type 0x26 +#define DW_TAG_constant 0x27 +#define DW_TAG_enumerator 0x28 +#define DW_TAG_friend 0x2a +#define DW_TAG_namelist 0x2b +#define DW_TAG_namelist_item 0x2c +#define DW_TAG_packed_type 0x2d +#define DW_TAG_subprogram 0x2e +#define DW_TAG_template_type_parameter 0x2f +#define DW_TAG_template_type_param 0x2f +#define DW_TAG_template_value_parameter 0x30 +#define DW_TAG_template_value_param 0x30 +#define DW_TAG_thrown_type 0x31 +#define DW_TAG_try_block 0x32 +#define DW_TAG_variant_part 0x33 +#define DW_TAG_variable 0x34 +#define DW_TAG_volatile_type 0x35 +#define DW_TAG_dwarf_procedure 0x36 +#define DW_TAG_restrict_type 0x37 +#define DW_TAG_interface_type 0x38 +#define DW_TAG_namespace 0x39 +#define DW_TAG_imported_module 0x3a +#define DW_TAG_unspecified_type 0x3b +#define DW_TAG_partial_unit 0x3c +#define DW_TAG_imported_unit 0x3d +#define DW_TAG_condition 0x3f +#define DW_TAG_shared_type 0x40 +#define DW_TAG_type_unit 0x41 +#define DW_TAG_rvalue_reference_type 0x42 +#define DW_TAG_template_alias 0x43 +#define DW_TAG_lo_user 0x4080 +#define DW_TAG_hi_user 0xffff + +/* GNU extensions. */ +#define DW_TAG_format_label 0x4101 +#define DW_TAG_function_template 0x4102 +#define DW_TAG_class_template 0x4103 +#define DW_TAG_GNU_BINCL 0x4104 +#define DW_TAG_GNU_EINCL 0x4105 +#define DW_TAG_GNU_template_template_parameter 0x4106 +#define DW_TAG_GNU_template_template_param 0x4106 +#define DW_TAG_GNU_template_parameter_pack 0x4107 +#define DW_TAG_GNU_formal_parameter_pack 0x4108 +#define DW_TAG_GNU_call_site 0x4109 +#define DW_TAG_GNU_call_site_parameter 0x410a + +#define DW_CHILDREN_no 0x00 +#define DW_CHILDREN_yes 0x01 + +#define DW_AT_sibling 0x01 +#define DW_AT_location 0x02 +#define DW_AT_name 0x03 +#define DW_AT_ordering 0x09 +#define DW_AT_subscr_data 0x0a +#define DW_AT_byte_size 0x0b +#define DW_AT_bit_offset 0x0c +#define DW_AT_bit_size 0x0d +#define DW_AT_element_list 0x0f +#define DW_AT_stmt_list 0x10 +#define DW_AT_low_pc 0x11 +#define DW_AT_high_pc 0x12 +#define DW_AT_language 0x13 +#define DW_AT_member 0x14 +#define DW_AT_discr 0x15 +#define DW_AT_discr_value 0x16 +#define DW_AT_visibility 0x17 +#define DW_AT_import 0x18 +#define DW_AT_string_length 0x19 +#define DW_AT_common_reference 0x1a +#define DW_AT_comp_dir 0x1b +#define DW_AT_const_value 0x1c +#define DW_AT_containing_type 0x1d +#define DW_AT_default_value 0x1e +#define DW_AT_inline 0x20 +#define DW_AT_is_optional 0x21 +#define DW_AT_lower_bound 0x22 +#define DW_AT_producer 0x25 +#define DW_AT_prototyped 0x27 +#define DW_AT_return_addr 0x2a +#define DW_AT_start_scope 0x2c +#define DW_AT_bit_stride 0x2e +#define DW_AT_stride_size 0x2e +#define DW_AT_upper_bound 0x2f +#define DW_AT_abstract_origin 0x31 +#define DW_AT_accessibility 0x32 +#define DW_AT_address_class 0x33 +#define DW_AT_artificial 0x34 +#define DW_AT_base_types 0x35 +#define DW_AT_calling_convention 0x36 +#define DW_AT_count 0x37 +#define DW_AT_data_member_location 0x38 +#define DW_AT_decl_column 0x39 +#define DW_AT_decl_file 0x3a +#define DW_AT_decl_line 0x3b +#define DW_AT_declaration 0x3c +#define DW_AT_discr_list 0x3d +#define DW_AT_encoding 0x3e +#define DW_AT_external 0x3f +#define DW_AT_frame_base 0x40 +#define DW_AT_friend 0x41 +#define DW_AT_identifier_case 0x42 +#define DW_AT_macro_info 0x43 +#define DW_AT_namelist_item 0x44 +#define DW_AT_priority 0x45 +#define DW_AT_segment 0x46 +#define DW_AT_specification 0x47 +#define DW_AT_static_link 0x48 +#define DW_AT_type 0x49 +#define DW_AT_use_location 0x4a +#define DW_AT_variable_parameter 0x4b +#define DW_AT_virtuality 0x4c +#define DW_AT_vtable_elem_location 0x4d +#define DW_AT_allocated 0x4e +#define DW_AT_associated 0x4f +#define DW_AT_data_location 0x50 +#define DW_AT_byte_stride 0x51 +#define DW_AT_entry_pc 0x52 +#define DW_AT_use_UTF8 0x53 +#define DW_AT_extension 0x54 +#define DW_AT_ranges 0x55 +#define DW_AT_trampoline 0x56 +#define DW_AT_call_column 0x57 +#define DW_AT_call_file 0x58 +#define DW_AT_call_line 0x59 +#define DW_AT_description 0x5a +#define DW_AT_binary_scale 0x5b +#define DW_AT_decimal_scale 0x5c +#define DW_AT_small 0x5d +#define DW_AT_decimal_sign 0x5e +#define DW_AT_digit_count 0x5f +#define DW_AT_picture_string 0x60 +#define DW_AT_mutable 0x61 +#define DW_AT_threads_scaled 0x62 +#define DW_AT_explicit 0x63 +#define DW_AT_object_pointer 0x64 +#define DW_AT_endianity 0x65 +#define DW_AT_elemental 0x66 +#define DW_AT_pure 0x67 +#define DW_AT_recursive 0x68 +#define DW_AT_signature 0x69 +#define DW_AT_main_subprogram 0x6a +#define DW_AT_data_bit_offset 0x6b +#define DW_AT_const_expr 0x6c +#define DW_AT_enum_class 0x6d +#define DW_AT_linkage_name 0x6e +#define DW_AT_lo_user 0x2000 +#define DW_AT_hi_user 0x3fff + +/* SGI/MIPS extensions. */ +#define DW_AT_MIPS_fde 0x2001 +#define DW_AT_MIPS_loop_begin 0x2002 +#define DW_AT_MIPS_tail_loop_begin 0x2003 +#define DW_AT_MIPS_epilog_begin 0x2004 +#define DW_AT_MIPS_loop_unroll_factor 0x2005 +#define DW_AT_MIPS_software_pipeline_depth 0x2006 +#define DW_AT_MIPS_linkage_name 0x2007 +#define DW_AT_MIPS_stride 0x2008 +#define DW_AT_MIPS_abstract_name 0x2009 +#define DW_AT_MIPS_clone_origin 0x200a +#define DW_AT_MIPS_has_inlines 0x200b +#define DW_AT_MIPS_stride_byte 0x200c +#define DW_AT_MIPS_stride_elem 0x200d +#define DW_AT_MIPS_ptr_dopetype 0x200e +#define DW_AT_MIPS_allocatable_dopetype 0x200f +#define DW_AT_MIPS_assumed_shape_dopetype 0x2010 +#define DW_AT_MIPS_assumed_size 0x2011 + +/* GNU extensions. */ +#define DW_AT_sf_names 0x2101 +#define DW_AT_src_info 0x2102 +#define DW_AT_mac_info 0x2103 +#define DW_AT_src_coords 0x2104 +#define DW_AT_body_begin 0x2105 +#define DW_AT_body_end 0x2106 +#define DW_AT_GNU_vector 0x2107 +#define DW_AT_GNU_guarded_by 0x2108 +#define DW_AT_GNU_pt_guarded_by 0x2109 +#define DW_AT_GNU_guarded 0x210a +#define DW_AT_GNU_pt_guarded 0x210b +#define DW_AT_GNU_locks_excluded 0x210c +#define DW_AT_GNU_exclusive_locks_required 0x210d +#define DW_AT_GNU_shared_locks_required 0x210e +#define DW_AT_GNU_odr_signature 0x210f +#define DW_AT_GNU_template_name 0x2110 +#define DW_AT_GNU_call_site_value 0x2111 +#define DW_AT_GNU_call_site_data_value 0x2112 +#define DW_AT_GNU_call_site_target 0x2113 +#define DW_AT_GNU_call_site_target_clobbered 0x2114 +#define DW_AT_GNU_tail_call 0x2115 +#define DW_AT_GNU_all_tail_call_sites 0x2116 +#define DW_AT_GNU_all_call_sites 0x2117 +#define DW_AT_GNU_all_source_call_sites 0x2118 + +/* Apple extensions. */ +#define DW_AT_APPLE_optimized 0x3fe1 +#define DW_AT_APPLE_flags 0x3fe2 +#define DW_AT_APPLE_isa 0x3fe3 +#define DW_AT_APPLE_block 0x3fe4 +#define DW_AT_APPLE_major_runtime_vers 0x3fe5 +#define DW_AT_APPLE_runtime_class 0x3fe6 +#define DW_AT_APPLE_omit_frame_ptr 0x3fe7 +#define DW_AT_APPLE_property_name 0x3fe8 +#define DW_AT_APPLE_property_getter 0x3fe9 +#define DW_AT_APPLE_property_setter 0x3fea +#define DW_AT_APPLE_property_attribute 0x3feb +#define DW_AT_APPLE_objc_complete_type 0x3fec +#define DW_AT_APPLE_property 0x3fed + +#define DW_FORM_addr 0x01 +#define DW_FORM_block2 0x03 +#define DW_FORM_block4 0x04 +#define DW_FORM_data2 0x05 +#define DW_FORM_data4 0x06 +#define DW_FORM_data8 0x07 +#define DW_FORM_string 0x08 +#define DW_FORM_block 0x09 +#define DW_FORM_block1 0x0a +#define DW_FORM_data1 0x0b +#define DW_FORM_flag 0x0c +#define DW_FORM_sdata 0x0d +#define DW_FORM_strp 0x0e +#define DW_FORM_udata 0x0f +#define DW_FORM_ref_addr 0x10 +#define DW_FORM_ref1 0x11 +#define DW_FORM_ref2 0x12 +#define DW_FORM_ref4 0x13 +#define DW_FORM_ref8 0x14 +#define DW_FORM_ref_udata 0x15 +#define DW_FORM_indirect 0x16 +#define DW_FORM_sec_offset 0x17 +#define DW_FORM_exprloc 0x18 +#define DW_FORM_flag_present 0x19 +#define DW_FORM_ref_sig8 0x20 +#define DW_FORM_GNU_ref_alt 0x1f20 +#define DW_FORM_GNU_strp_alt 0x1f21 + +#define DW_OP_addr 0x03 +#define DW_OP_deref 0x06 +#define DW_OP_const1u 0x08 +#define DW_OP_const1s 0x09 +#define DW_OP_const2u 0x0a +#define DW_OP_const2s 0x0b +#define DW_OP_const4u 0x0c +#define DW_OP_const4s 0x0d +#define DW_OP_const8u 0x0e +#define DW_OP_const8s 0x0f +#define DW_OP_constu 0x10 +#define DW_OP_consts 0x11 +#define DW_OP_dup 0x12 +#define DW_OP_drop 0x13 +#define DW_OP_over 0x14 +#define DW_OP_pick 0x15 +#define DW_OP_swap 0x16 +#define DW_OP_rot 0x17 +#define DW_OP_xderef 0x18 +#define DW_OP_abs 0x19 +#define DW_OP_and 0x1a +#define DW_OP_div 0x1b +#define DW_OP_minus 0x1c +#define DW_OP_mod 0x1d +#define DW_OP_mul 0x1e +#define DW_OP_neg 0x1f +#define DW_OP_not 0x20 +#define DW_OP_or 0x21 +#define DW_OP_plus 0x22 +#define DW_OP_plus_uconst 0x23 +#define DW_OP_shl 0x24 +#define DW_OP_shr 0x25 +#define DW_OP_shra 0x26 +#define DW_OP_xor 0x27 +#define DW_OP_bra 0x28 +#define DW_OP_eq 0x29 +#define DW_OP_ge 0x2a +#define DW_OP_gt 0x2b +#define DW_OP_le 0x2c +#define DW_OP_lt 0x2d +#define DW_OP_ne 0x2e +#define DW_OP_skip 0x2f +#define DW_OP_lit0 0x30 +#define DW_OP_lit1 0x31 +#define DW_OP_lit2 0x32 +#define DW_OP_lit3 0x33 +#define DW_OP_lit4 0x34 +#define DW_OP_lit5 0x35 +#define DW_OP_lit6 0x36 +#define DW_OP_lit7 0x37 +#define DW_OP_lit8 0x38 +#define DW_OP_lit9 0x39 +#define DW_OP_lit10 0x3a +#define DW_OP_lit11 0x3b +#define DW_OP_lit12 0x3c +#define DW_OP_lit13 0x3d +#define DW_OP_lit14 0x3e +#define DW_OP_lit15 0x3f +#define DW_OP_lit16 0x40 +#define DW_OP_lit17 0x41 +#define DW_OP_lit18 0x42 +#define DW_OP_lit19 0x43 +#define DW_OP_lit20 0x44 +#define DW_OP_lit21 0x45 +#define DW_OP_lit22 0x46 +#define DW_OP_lit23 0x47 +#define DW_OP_lit24 0x48 +#define DW_OP_lit25 0x49 +#define DW_OP_lit26 0x4a +#define DW_OP_lit27 0x4b +#define DW_OP_lit28 0x4c +#define DW_OP_lit29 0x4d +#define DW_OP_lit30 0x4e +#define DW_OP_lit31 0x4f +#define DW_OP_reg0 0x50 +#define DW_OP_reg1 0x51 +#define DW_OP_reg2 0x52 +#define DW_OP_reg3 0x53 +#define DW_OP_reg4 0x54 +#define DW_OP_reg5 0x55 +#define DW_OP_reg6 0x56 +#define DW_OP_reg7 0x57 +#define DW_OP_reg8 0x58 +#define DW_OP_reg9 0x59 +#define DW_OP_reg10 0x5a +#define DW_OP_reg11 0x5b +#define DW_OP_reg12 0x5c +#define DW_OP_reg13 0x5d +#define DW_OP_reg14 0x5e +#define DW_OP_reg15 0x5f +#define DW_OP_reg16 0x60 +#define DW_OP_reg17 0x61 +#define DW_OP_reg18 0x62 +#define DW_OP_reg19 0x63 +#define DW_OP_reg20 0x64 +#define DW_OP_reg21 0x65 +#define DW_OP_reg22 0x66 +#define DW_OP_reg23 0x67 +#define DW_OP_reg24 0x68 +#define DW_OP_reg25 0x69 +#define DW_OP_reg26 0x6a +#define DW_OP_reg27 0x6b +#define DW_OP_reg28 0x6c +#define DW_OP_reg29 0x6d +#define DW_OP_reg30 0x6e +#define DW_OP_reg31 0x6f +#define DW_OP_breg0 0x70 +#define DW_OP_breg1 0x71 +#define DW_OP_breg2 0x72 +#define DW_OP_breg3 0x73 +#define DW_OP_breg4 0x74 +#define DW_OP_breg5 0x75 +#define DW_OP_breg6 0x76 +#define DW_OP_breg7 0x77 +#define DW_OP_breg8 0x78 +#define DW_OP_breg9 0x79 +#define DW_OP_breg10 0x7a +#define DW_OP_breg11 0x7b +#define DW_OP_breg12 0x7c +#define DW_OP_breg13 0x7d +#define DW_OP_breg14 0x7e +#define DW_OP_breg15 0x7f +#define DW_OP_breg16 0x80 +#define DW_OP_breg17 0x81 +#define DW_OP_breg18 0x82 +#define DW_OP_breg19 0x83 +#define DW_OP_breg20 0x84 +#define DW_OP_breg21 0x85 +#define DW_OP_breg22 0x86 +#define DW_OP_breg23 0x87 +#define DW_OP_breg24 0x88 +#define DW_OP_breg25 0x89 +#define DW_OP_breg26 0x8a +#define DW_OP_breg27 0x8b +#define DW_OP_breg28 0x8c +#define DW_OP_breg29 0x8d +#define DW_OP_breg30 0x8e +#define DW_OP_breg31 0x8f +#define DW_OP_regx 0x90 +#define DW_OP_fbreg 0x91 +#define DW_OP_bregx 0x92 +#define DW_OP_piece 0x93 +#define DW_OP_deref_size 0x94 +#define DW_OP_xderef_size 0x95 +#define DW_OP_nop 0x96 +#define DW_OP_push_object_address 0x97 +#define DW_OP_call2 0x98 +#define DW_OP_call4 0x99 +#define DW_OP_call_ref 0x9a +#define DW_OP_form_tls_address 0x9b +#define DW_OP_call_frame_cfa 0x9c +#define DW_OP_bit_piece 0x9d +#define DW_OP_implicit_value 0x9e +#define DW_OP_stack_value 0x9f +#define DW_OP_lo_user 0xe0 +#define DW_OP_hi_user 0xff + +/* GNU extensions. */ +#define DW_OP_GNU_push_tls_address 0xe0 +#define DW_OP_GNU_uninit 0xf0 +#define DW_OP_GNU_encoded_addr 0xf1 +#define DW_OP_GNU_implicit_pointer 0xf2 +#define DW_OP_GNU_entry_value 0xf3 +#define DW_OP_GNU_const_type 0xf4 +#define DW_OP_GNU_regval_type 0xf5 +#define DW_OP_GNU_deref_type 0xf6 +#define DW_OP_GNU_convert 0xf7 +#define DW_OP_GNU_reinterpret 0xf9 +#define DW_OP_GNU_parameter_ref 0xfa +#define DW_OP_GNU_addr_index 0xfb +#define DW_OP_GNU_const_index 0xfc + +#define DW_ATE_address 0x1 +#define DW_ATE_boolean 0x2 +#define DW_ATE_complex_float 0x3 +#define DW_ATE_float 0x4 +#define DW_ATE_signed 0x5 +#define DW_ATE_signed_char 0x6 +#define DW_ATE_unsigned 0x7 +#define DW_ATE_unsigned_char 0x8 +#define DW_ATE_imaginary_float 0x9 +#define DW_ATE_packed_decimal 0xa +#define DW_ATE_numeric_string 0xb +#define DW_ATE_edited 0xc +#define DW_ATE_signed_fixed 0xd +#define DW_ATE_unsigned_fixed 0xe +#define DW_ATE_decimal_float 0xf +#define DW_ATE_lo_user 0x80 +#define DW_ATE_hi_user 0xff + +#define DW_ACCESS_public 0x01 +#define DW_ACCESS_protected 0x02 +#define DW_ACCESS_private 0x03 + +#define DW_END_default 0x00 +#define DW_END_big 0x01 +#define DW_END_little 0x02 +#define DW_END_lo_user 0x40 +#define DW_END_high_user 0xff + +#define DW_VIS_local 0x01 +#define DW_VIS_exported 0x02 +#define DW_VIS_qualified 0x03 + +#define DW_VIRTUALITY_none 0x00 +#define DW_VIRTUALITY_virtual 0x01 +#define DW_VIRTUALITY_pure_virtual 0x02 + +#define DW_LANG_C89 0x0001 +#define DW_LANG_C 0x0002 +#define DW_LANG_Ada83 0x0003 +#define DW_LANG_C_plus_plus 0x0004 +#define DW_LANG_Cobol74 0x0005 +#define DW_LANG_Cobol85 0x0006 +#define DW_LANG_Fortran77 0x0007 +#define DW_LANG_Fortran90 0x0008 +#define DW_LANG_Pascal83 0x0009 +#define DW_LANG_Modula2 0x000a +#define DW_LANG_Java 0x000b +#define DW_LANG_C99 0x000c +#define DW_LANG_Ada95 0x000d +#define DW_LANG_Fortran95 0x000e +#define DW_LANG_PLI 0x000f +#define DW_LANG_ObjC 0x0010 +#define DW_LANG_ObjC_plus_plus 0x0011 +#define DW_LANG_UPC 0x0012 +#define DW_LANG_D 0x0013 +#define DW_LANG_Python 0x0014 +#define DW_LANG_OpenCL 0x0015 +#define DW_LANG_Go 0x0016 +#define DW_LANG_Modula3 0x0017 +#define DW_LANG_Haskell 0x0018 +#define DW_LANG_C_plus_plus_03 0x0019 +#define DW_LANG_C_plus_plus_11 0x001a +#define DW_LANG_OCaml 0x001b +#define DW_LANG_Rust 0x001c +#define DW_LANG_C11 0x001d +#define DW_LANG_Swift 0x001e +#define DW_LANG_Julia 0x001f +#define DW_LANG_Dylan 0x0020 +#define DW_LANG_C_plus_plus_14 0x0021 +#define DW_LANG_Fortran03 0x0022 +#define DW_LANG_Fortran08 0x0023 +#define DW_LANG_RenderScript 0x0024 +#define DW_LANG_BLISS 0x0025 +#define DW_LANG_lo_user 0x8000 +#define DW_LANG_Mips_Assembler 0x8001 +#define DW_LANG_hi_user 0xffff + +#define DW_ID_case_sensitive 0x00 +#define DW_ID_up_case 0x01 +#define DW_ID_down_case 0x02 +#define DW_ID_case_insensitive 0x03 + +#define DW_CC_normal 0x01 +#define DW_CC_program 0x02 +#define DW_CC_nocall 0x03 +#define DW_CC_lo_user 0x40 +#define DW_CC_hi_user 0xff + +#define DW_INL_not_inlined 0x00 +#define DW_INL_inlined 0x01 +#define DW_INL_declared_not_inlined 0x02 +#define DW_INL_declared_inlined 0x03 + +#define DW_ORD_row_major 0x00 +#define DW_ORD_col_major 0x01 + +#define DW_DS_unsigned 0x01 +#define DW_DS_leading_overpunch 0x02 +#define DW_DS_trailing_overpunch 0x03 +#define DW_DS_leading_separate 0x04 +#define DW_DS_trailing_separate 0x05 + +#define DW_DSC_label 0x00 +#define DW_DSC_range 0x01 + +#define DW_LNS_copy 0x01 +#define DW_LNS_advance_pc 0x02 +#define DW_LNS_advance_line 0x03 +#define DW_LNS_set_file 0x04 +#define DW_LNS_set_column 0x05 +#define DW_LNS_negate_stmt 0x06 +#define DW_LNS_set_basic_block 0x07 +#define DW_LNS_const_add_pc 0x08 +#define DW_LNS_fixed_advance_pc 0x09 +#define DW_LNS_set_prologue_end 0x0a +#define DW_LNS_set_epilogue_begin 0x0b +#define DW_LNS_set_isa 0x0c + +#define DW_LNE_end_sequence 0x01 +#define DW_LNE_set_address 0x02 +#define DW_LNE_define_file 0x03 +#define DW_LNE_lo_user 0x80 +#define DW_LNE_hi_user 0xff + +#define DW_MACINFO_define 0x01 +#define DW_MACINFO_undef 0x02 +#define DW_MACINFO_start_file 0x03 +#define DW_MACINFO_end_file 0x04 +#define DW_MACINFO_vendor_ext 0xff + +#define DW_CFA_advance_loc 0x40 +#define DW_CFA_offset 0x80 +#define DW_CFA_restore 0xc0 +#define DW_CFA_extended 0 + +#define DW_CFA_nop 0x00 +#define DW_CFA_set_loc 0x01 +#define DW_CFA_advance_loc1 0x02 +#define DW_CFA_advance_loc2 0x03 +#define DW_CFA_advance_loc4 0x04 +#define DW_CFA_offset_extended 0x05 +#define DW_CFA_restore_extended 0x06 +#define DW_CFA_undefined 0x07 +#define DW_CFA_same_value 0x08 +#define DW_CFA_register 0x09 +#define DW_CFA_remember_state 0x0a +#define DW_CFA_restore_state 0x0b +#define DW_CFA_def_cfa 0x0c +#define DW_CFA_def_cfa_register 0x0d +#define DW_CFA_def_cfa_offset 0x0e +#define DW_CFA_def_cfa_expression 0x0f +#define DW_CFA_expression 0x10 +#define DW_CFA_offset_extended_sf 0x11 +#define DW_CFA_def_cfa_sf 0x12 +#define DW_CFA_def_cfa_offset_sf 0x13 +#define DW_CFA_val_offset 0x14 +#define DW_CFA_val_offset_sf 0x15 +#define DW_CFA_val_expression 0x16 +#define DW_CFA_lo_user 0x1c +#define DW_CFA_high_user 0x3f + +/* + * LSB(Linux Standard Base) extension to DWARF2. + */ + +#define DW_EH_PE_absptr 0x00 +#define DW_EH_PE_uleb128 0x01 +#define DW_EH_PE_udata2 0x02 +#define DW_EH_PE_udata4 0x03 +#define DW_EH_PE_udata8 0x04 +#define DW_EH_PE_sleb128 0x09 +#define DW_EH_PE_sdata2 0x0a +#define DW_EH_PE_sdata4 0x0b +#define DW_EH_PE_sdata8 0x0c +#define DW_EH_PE_pcrel 0x10 +#define DW_EH_PE_textrel 0x20 +#define DW_EH_PE_datarel 0x30 +#define DW_EH_PE_funcrel 0x40 +#define DW_EH_PE_aligned 0x50 +#define DW_EH_PE_omit 0xff + +#endif /* !_DWARF_H_ */ diff --git a/src/crash-stack/unwind.c b/src/crash-stack/unwind.c index d372bbe..f984b92 100644 --- a/src/crash-stack/unwind.c +++ b/src/crash-stack/unwind.c @@ -27,8 +27,6 @@ * DAMAGE. */ -#include -#include #include #include #include @@ -39,11 +37,15 @@ #include #include +#include "dwarf.h" #include "mem_map.h" #include "proc.h" #include "crash-stack.h" +#include "shared/elf_helpers.h" +#ifndef LOG_TAG #define LOG_TAG "CRASH_STACK" +#endif #include "shared/log.h" size_t stack_size = 0xa00000; @@ -76,6 +78,7 @@ static unsigned long eip = 0; static unsigned long esp = 0; static FILE *debug; + static Elf *elf_start(int fd, char *image, uint64_t size) { Elf *elf; @@ -99,24 +102,16 @@ static int find_exidx(int fd, char *image, uint64_t size, uint64_t *table_data, uint64_t *table_len) { Elf *elf; - GElf_Ehdr ehdr; Elf_Scn *scn = NULL; - GElf_Shdr shdr; uint64_t offset = 0; if ((elf = elf_start(fd, image, size)) == NULL) return -1; - if (gelf_getehdr(elf, &ehdr) == NULL) { - _E("elf_getehdr: %s", elf_errmsg(elf_errno())); - goto find_exidx_end; - } - while ((scn = elf_nextscn(elf, scn)) != NULL) { - if (gelf_getshdr(scn, &shdr) == NULL) { - _E("elf_getshdr: %s", elf_errmsg(elf_errno())); - break; - } + Elf64_Shdr shdr; + if (!elf_get_shdr(elf, scn, &shdr)) + break; if (shdr.sh_type == SHT_ARM_EXIDX) { Elf_Data *data = NULL; @@ -131,7 +126,6 @@ static int find_exidx(int fd, char *image, uint64_t size, } } -find_exidx_end: elf_end(elf); return (offset ? 0 : -1); } @@ -252,28 +246,24 @@ static int find_eh_frame_hdr(int fd, char *image, uint64_t size, uint64_t *table_data, uint64_t *segbase, uint64_t *fde_count) { Elf *elf; - GElf_Ehdr ehdr; + Elf64_Ehdr ehdr; Elf_Scn *scn = NULL; - GElf_Shdr shdr; + Elf64_Shdr shdr; uint64_t offset = 0; if ((elf = elf_start(fd, image, size)) == NULL) return -1; - if (gelf_getehdr(elf, &ehdr) == NULL) { + if (!elf_get_ehdr(elf, &ehdr)) { _E("elf_getehdr: %s", elf_errmsg(elf_errno())); goto elf_section_offset_end; } while ((scn = elf_nextscn(elf, scn)) != NULL) { - char *str; - - if (gelf_getshdr(scn, &shdr) == NULL) { - _E("elf_getshdr: %s", elf_errmsg(elf_errno())); + if (!elf_get_shdr(elf, scn, &shdr)) break; - } - str = elf_strptr(elf, ehdr.e_shstrndx, shdr.sh_name); + char *str = elf_strptr(elf, ehdr.e_shstrndx, shdr.sh_name); if (str != NULL && !strcmp(str, ".eh_frame_hdr")) { Elf_Data *data = NULL; @@ -315,7 +305,7 @@ static int find_unwind_table(int fd, char *image, uint64_t size, */ struct symbols { - GElf_Sym *s_data; + Elf64_Sym *s_data; size_t s_size; size_t s_cap; }; @@ -323,22 +313,22 @@ struct symbols /* * add a symbol to array */ -static int push_symbol(struct symbols *array, const GElf_Sym *s) +static int push_symbol(struct symbols *array, const Elf64_Sym *s) { ++array->s_size; if (array->s_size > array->s_cap) { - GElf_Sym *new_data; + Elf64_Sym *new_data; array->s_cap <<= 1; - new_data = malloc(sizeof(GElf_Sym) * array->s_cap); + new_data = malloc(sizeof(Elf64_Sym) * array->s_cap); if (new_data == NULL) { _E("malloc(): %m"); return -1; } - memcpy(new_data, array->s_data, sizeof(GElf_Sym) * (array->s_size-1)); + memcpy(new_data, array->s_data, sizeof(Elf64_Sym) * (array->s_size-1)); free(array->s_data); array->s_data = new_data; } - memcpy(array->s_data + (array->s_size-1), s, sizeof(GElf_Sym)); + memcpy(array->s_data + (array->s_size-1), s, sizeof(Elf64_Sym)); return 0; } @@ -347,8 +337,8 @@ static int push_symbol(struct symbols *array, const GElf_Sym *s) */ static int sym_compar(const void *v1, const void *v2) { - const GElf_Sym *s1 = v1; - const GElf_Sym *s2 = v2; + const Elf64_Sym *s1 = v1; + const Elf64_Sym *s2 = v2; if (s1->st_value < s2->st_value) return -1; @@ -388,7 +378,7 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, */ all.s_cap = 64; all.s_size = 0; - all.s_data = malloc(all.s_cap * sizeof(GElf_Sym)); + all.s_data = malloc(all.s_cap * sizeof(Elf64_Sym)); if (all.s_data == NULL) goto proc_name_end; @@ -397,8 +387,8 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, goto proc_name_end; for (i = 0; i < pnum; ++i) { - GElf_Phdr phdr; - if (gelf_getphdr(elf, i, &phdr) == NULL) + Elf64_Phdr phdr; + if (!elf_get_phdr(elf, i, &phdr)) goto proc_name_end; if (phdr.p_type != PT_LOAD) continue; @@ -420,10 +410,9 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, * search symtab or dynsym section */ while ((scn = elf_nextscn(elf, scn)) != NULL) { - GElf_Shdr shdr; + Elf64_Shdr shdr; - if (gelf_getshdr(scn, &shdr) == NULL) { - _E("elf_nextscn: %s", elf_errmsg(elf_errno())); + if (!elf_get_shdr(elf, scn, &shdr)) { goto proc_name_end; } @@ -438,9 +427,9 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, symbol_count = shdr.sh_size / shdr.sh_entsize; for (i = 0; i < (size_t)symbol_count; ++i) { - GElf_Sym s; + Elf64_Sym s; - if (gelf_getsym(data, i, &s) == NULL) { + if (!elf_get_sym(elf, data, i, &s)) { _E("elf_getsym: %s", elf_errmsg(elf_errno())); rc = -1; @@ -489,10 +478,10 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, * one of zero size */ if (!rc && str == NULL) { - qsort(all.s_data, all.s_size, sizeof(GElf_Sym), sym_compar); + qsort(all.s_data, all.s_size, sizeof(Elf64_Sym), sym_compar); for (i = 0; i < (all.s_size-1); ++i) { - const GElf_Sym *cur = all.s_data + i; - const GElf_Sym *next = all.s_data + i + 1; + const Elf64_Sym *cur = all.s_data + i; + const Elf64_Sym *next = all.s_data + i + 1; if (cur->st_size == 0) { if (cur->st_value <= addr && addr < next->st_value) { str = elf_strptr(elf, cur->st_shndx, cur->st_name); diff --git a/src/livedumper/CMakeLists.txt b/src/livedumper/CMakeLists.txt index efdf65a..26b8902 100644 --- a/src/livedumper/CMakeLists.txt +++ b/src/livedumper/CMakeLists.txt @@ -4,7 +4,7 @@ project(livedumper CXX) set(LIVEDUMPER_BIN "livedumper") find_package( Boost 1.58 COMPONENTS system REQUIRED) -include_directories ( ${Boost_INCLUDE_DIR} ) +include_directories ( ${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src ) set(PREFIX ${CMAKE_INSTALL_PREFIX}) add_definitions(-std=c++11) diff --git a/src/livedumper/core.hpp b/src/livedumper/core.hpp index e9ae8dc..d93df7e 100644 --- a/src/livedumper/core.hpp +++ b/src/livedumper/core.hpp @@ -22,9 +22,9 @@ #include "log.hpp" #include "note.hpp" #include "program.hpp" +#include "shared/elf_helpers.h" #include -#include #include #include #include @@ -289,7 +289,6 @@ class Core { sym_data->elf = elf_begin(sym_data->fd, ELF_C_READ, nullptr); while (1) { - GElf_Shdr *shdr; scn = elf_nextscn(sym_data->elf, scn); if (!scn) { @@ -300,8 +299,8 @@ class Core { return nullptr; } - shdr = gelf_getshdr(scn, &sym_data->shdr); - if (shdr && sym_data->shdr.sh_type == type) + if (elf_get_shdr(sym_data->elf, scn, &sym_data->shdr) && + sym_data->shdr.sh_type == type) break; } @@ -366,19 +365,17 @@ class Core { bool SymAddress(const char *sym_name, unsigned long *addr) { for (const auto &sd : m_symdata) { for (int i = 0; i < sd->count; i++) { - GElf_Sym sym; - GElf_Sym *s; + Elf64_Sym sym; - s = gelf_getsym(sd->data, i, &sym); - if (!s) + if (!elf_get_sym(sd->elf, sd->data, i, &sym)) continue; - const char *st = elf_strptr(sd->elf, sd->shdr.sh_link, s->st_name); + const char *st = elf_strptr(sd->elf, sd->shdr.sh_link, sym.st_name); if (strcmp(st, sym_name) != 0) continue; - *addr = sd->start + s->st_value; + *addr = sd->start + sym.st_value; return true; } } diff --git a/src/shared/elf_helpers.h b/src/shared/elf_helpers.h new file mode 100644 index 0000000..b919e7a --- /dev/null +++ b/src/shared/elf_helpers.h @@ -0,0 +1,209 @@ +/* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TBRICKS + * AB BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THISS OFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + */ +#ifndef ELF_HELPERS_H +#define ELF_HELPERS_H + +#include +#include +#include +#include + +#include "shared/log.h" + +bool elf_get_shdr(Elf *elf, Elf_Scn *scn, Elf64_Shdr *shdr) +{ + assert(elf); + assert(scn); + assert(shdr); + + size_t ident_size; + char *elf_ident = elf_getident(elf, &ident_size); + if (elf_ident == NULL || ident_size <= EI_CLASS) { + _E("Cannot read ELF ident"); + return false; + } + + if (elf_ident[EI_CLASS] == ELFCLASS32) { + Elf32_Shdr *shdr32; + shdr32 = elf32_getshdr(scn); + if (shdr32 == NULL) { + _E("elf32_getshdr error: %s", elf_errmsg(elf_errno())); + return false; + } + + shdr->sh_name = shdr32->sh_name; + shdr->sh_type = shdr32->sh_type; + shdr->sh_flags = (Elf64_Xword) shdr32->sh_flags; + shdr->sh_addr = (Elf64_Addr) shdr32->sh_addr; + shdr->sh_offset = (Elf64_Off) shdr32->sh_offset; + shdr->sh_size = (Elf64_Xword) shdr32->sh_size; + shdr->sh_link = shdr32->sh_link; + shdr->sh_info = shdr32->sh_info; + shdr->sh_addralign = (Elf64_Xword) shdr32->sh_addralign; + shdr->sh_entsize = (Elf64_Xword) shdr32->sh_entsize; + } else { + Elf64_Shdr *shdr64 = elf64_getshdr(scn); + if (shdr64 == NULL) { + _E("elf64_getshdr error: %s", elf_errmsg(elf_errno())); + return false; + } + *shdr = *shdr64; + } + return true; +} + +bool elf_get_ehdr(Elf *elf, Elf64_Ehdr *ehdr) +{ + assert(elf); + assert(ehdr); + + size_t ident_size; + char *elf_ident = elf_getident(elf, &ident_size); + if (elf_ident == NULL || ident_size <= EI_CLASS) { + _E("Cannot read ELF ident"); + return false; + } + + if (elf_ident[EI_CLASS] == ELFCLASS32) { + Elf32_Ehdr *ehdr32; + ehdr32 = elf32_getehdr(elf); + if (ehdr32 == NULL) { + _E("elf32_getehdr error: %s", elf_errmsg(elf_errno())); + return false; + } + + (void) memcpy(ehdr->e_ident, + ehdr32->e_ident, + sizeof(ehdr32->e_ident)); + + ehdr->e_type = ehdr32->e_type; + ehdr->e_machine = ehdr32->e_machine; + ehdr->e_version = ehdr32->e_version; + ehdr->e_entry = ehdr32->e_entry; + ehdr->e_phoff = ehdr32->e_phoff; + ehdr->e_shoff = ehdr32->e_shoff; + ehdr->e_flags = ehdr32->e_flags; + ehdr->e_ehsize = ehdr32->e_ehsize; + ehdr->e_phentsize = ehdr32->e_phentsize; + ehdr->e_phnum = ehdr32->e_phnum; + ehdr->e_shentsize = ehdr32->e_shentsize; + ehdr->e_shnum = ehdr32->e_shnum; + ehdr->e_shstrndx = ehdr32->e_shstrndx; + } else { + Elf64_Ehdr *ehdr64 = elf64_getehdr(elf); + if (ehdr64 == NULL) { + _E("elf64_getehdr error: %s", elf_errmsg(elf_errno())); + return false; + } + *ehdr = *ehdr64; + } + return true; +} + +bool elf_get_phdr(Elf *elf, int index, Elf64_Phdr *phdr) +{ + assert(elf); + assert(index >= 0); + assert(phdr); + + size_t ident_size; + char *elf_ident = elf_getident(elf, &ident_size); + if (elf_ident == NULL || ident_size <= EI_CLASS) { + _E("Cannot read ELF ident"); + return false; + } + + size_t phdr_num; + if (elf_getphdrnum(elf, &phdr_num) == -1) { + _E("Cannot get program headers count"); + return false; + } + + if ((size_t)index >= phdr_num) { + _E("Index is larger than the number of program headers"); + return false; + } + + if (elf_ident[EI_CLASS] == ELFCLASS32) { + Elf32_Phdr *phdr32; + phdr32 = elf32_getphdr(elf); + if (phdr32 == NULL) { + _E("elf32_getphdr error: %s", elf_errmsg(elf_errno())); + return false; + } + + phdr32 += index; + + phdr->p_type = phdr32->p_type; + phdr->p_offset = phdr32->p_offset; + phdr->p_vaddr = (Elf64_Addr) phdr32->p_vaddr; + phdr->p_paddr = (Elf64_Addr) phdr32->p_paddr; + phdr->p_filesz = (Elf64_Xword) phdr32->p_filesz; + phdr->p_memsz = (Elf64_Xword) phdr32->p_memsz; + phdr->p_flags = phdr32->p_flags; + phdr->p_align = (Elf64_Xword) phdr32->p_align; + } else { + Elf64_Phdr *phdr64 = elf64_getphdr(elf); + if (phdr64 == NULL) { + _E("elf64_getphdr error: %s", elf_errmsg(elf_errno())); + return false; + } + phdr64 += index; + *phdr = *phdr64; + } + return true; +} + +bool elf_get_sym(Elf *elf, Elf_Data *data, int index, Elf64_Sym *sym) +{ + assert(elf); + assert(index >= 0); + assert(sym); + + size_t ident_size; + char *elf_ident = elf_getident(elf, &ident_size); + if (elf_ident == NULL || ident_size <= EI_CLASS) { + _E("Cannot read ELF ident"); + return false; + } + + if (elf_ident[EI_CLASS] == ELFCLASS32) { + Elf32_Sym *sym32 = &((Elf32_Sym *)data->d_buf)[index]; + + sym->st_name = sym32->st_name; + sym->st_info = sym32->st_info; + sym->st_other = sym32->st_other; + sym->st_shndx = sym32->st_shndx; + sym->st_value = sym32->st_value; + sym->st_size = sym32->st_size; + } else { + *sym = ((Elf64_Sym *)data->d_buf)[index]; + } + return true; +} +#endif // ELF_HELPERS_H -- 2.7.4 From e393b3c2dc8dc46d630f8a272fe99cd5c025658b Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Fri, 17 Jul 2020 16:36:51 +0200 Subject: [PATCH 04/16] Release 5.5.41 Change-Id: I84fe783e7033b291bb18d6f41cfc7c9ec0d17c9d --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 013e409..7145968 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 5.5.40 +Version: 5.5.41 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From 421b0cda325f7f0ecb8242bf43decf60d5ddb7bf Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Tue, 15 Sep 2020 13:00:44 +0200 Subject: [PATCH 05/16] Fix coverity issue - untrusted divisor Change-Id: I9be328f16c0a3a1b59652656f496218b2c51cc7d --- src/crash-stack/unwind.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/crash-stack/unwind.c b/src/crash-stack/unwind.c index f984b92..be5b81a 100644 --- a/src/crash-stack/unwind.c +++ b/src/crash-stack/unwind.c @@ -425,7 +425,11 @@ static char *proc_name(int fd, char *image, size_t size, uint64_t load, goto proc_name_end; } - symbol_count = shdr.sh_size / shdr.sh_entsize; + if (shdr.sh_entsize == 0) + symbol_count = 0; + else + symbol_count = shdr.sh_size / shdr.sh_entsize; + for (i = 0; i < (size_t)symbol_count; ++i) { Elf64_Sym s; -- 2.7.4 From ed7d431a5572414a2ac3bba640992875f0f8eeec Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Fri, 30 Oct 2020 12:23:03 +0100 Subject: [PATCH 06/16] Release 5.5.42 Change-Id: If159756bf6815e5c509028b5f97965f2e7cb11c4 --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 7145968..e30fdf5 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 5.5.41 +Version: 5.5.42 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From 2bcd0ee3fd0273c394c4173acb096ddb88e6f858 Mon Sep 17 00:00:00 2001 From: Michal Bloch Date: Mon, 7 Dec 2020 22:16:07 +0100 Subject: [PATCH 07/16] Fix null dereferences Change-Id: Id23b9aaad60752f797783f9ccc6f9bbfa9357941 Signed-off-by: Michal Bloch (cherry picked from commit a9a8f5e3955f55e03a05878a381257085dc02951) --- src/crash-stack/proc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/crash-stack/proc.c b/src/crash-stack/proc.c index 46f40e1..8946c21 100644 --- a/src/crash-stack/proc.c +++ b/src/crash-stack/proc.c @@ -294,6 +294,8 @@ char *get_thread_states(const int *tids, int n) { int i; char *res = calloc(1, n); + if (!res) + return NULL; for (i = 0; i < n; ++i) { int state = proc_state(tids[i]); @@ -383,6 +385,9 @@ static int copy_memory_process_vm_readv(int pid, remote_iov = malloc(sizeof(struct iovec)*n_frames); frame_bytes = malloc(sizeof(ssize_t)*n_frames); + if (!local_iov || !remote_iov || !frame_bytes) + goto process_vm_readv_end; + for (i = 0; i < n_frames; ++i) { local_iov[i].iov_base = frames[i]->data; local_iov[i].iov_len = frames[i]->length; -- 2.7.4 From 48576fa3724974f35771238dca0febe79f110616 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Thu, 14 Jan 2021 14:30:10 +0100 Subject: [PATCH 08/16] Fix dbus policy for livedump_pid Change-Id: I4f7c5095edcfc4c27b33c982c2c82e415a27e646 --- src/crash-service/crash-service.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crash-service/crash-service.conf b/src/crash-service/crash-service.conf index dd38a30..ef030b5 100644 --- a/src/crash-service/crash-service.conf +++ b/src/crash-service/crash-service.conf @@ -20,10 +20,10 @@ + - -- 2.7.4 From b16e12642d9b7460ef5b4a044516ddd64c8eed39 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Thu, 14 Jan 2021 15:11:13 +0100 Subject: [PATCH 09/16] Release 5.5.43 Change-Id: Id2dc4d931ae631a2f2b146f38a213476fa457835 --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index e30fdf5..3cfc088 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 5.5.42 +Version: 5.5.43 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From c646cf8b9f18772567b83431ce6c8b864a65a2ca Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Tue, 2 Feb 2021 11:01:06 +0100 Subject: [PATCH 10/16] crash-manager: Set primary group Change-Id: Id9e811e5cd4236a0ec7641295e08bb4f49827ab7 --- src/crash-manager/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/crash-manager/main.c b/src/crash-manager/main.c index a4a67ca..e495500 100644 --- a/src/crash-manager/main.c +++ b/src/crash-manager/main.c @@ -238,6 +238,11 @@ static bool drop_privileges(const char *user_name) if (!set_groups(user_name, user_info->pw_gid)) return false; + if (setgid(user_info->pw_gid) == -1) { + _E("setgid() error: %m\n"); + return false; + } + if (setuid(user_info->pw_uid) == -1) { _E("setuid() error: %m\n"); return false; -- 2.7.4 From b4e5a8d5aec4af8238810ccbcd3004b16af7c03f Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Tue, 2 Feb 2021 13:38:35 +0100 Subject: [PATCH 11/16] Release 5.5.44 Change-Id: If1981d99b883cd1f322597cc5514db555effc505 --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 3cfc088..0d187ca 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 5.5.43 +Version: 5.5.44 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From 6a0fa6cb25506969c4e086112658c64ef6254929 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 4 Feb 2021 12:05:22 +0100 Subject: [PATCH 12/16] packaging: Drop redundant directories These directories are created on-demand by crash-manager/service. There is no need to main correct permission/label set in multiple places. Change-Id: Ie81cd358d9e17d4249bbdc0a2ed791b5097fa583 --- packaging/crash-worker.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 0d187ca..c7aec82 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -161,20 +161,26 @@ make doc rm -rf %{buildroot} %make_install mkdir -p %{buildroot}%{crash_root_path} -mkdir -p %{buildroot}%{crash_path} -mkdir -p %{buildroot}%{crash_temp} %post -/usr/bin/chsmack -a "System" -t %{crash_path} -/usr/bin/chsmack -a "System" -t %{crash_temp} +chsmack -a "System" -t %{crash_root_path} +if [ $1 -eq 2 ] ; then + # All directories are created with appropriate permissions by + # crash-manager/service (0775) and with correct label (System) + # due to smack execute being set to System on /usr/bin/crash-manager + # binary. + # + # Following is only for package-based upgrade in Tizen 6.5 + # Drop this in Tizen 7.0 + chsmack -a "System" -t %{crash_path} + chsmack -a "System" -t %{crash_temp} +fi %files %license LICENSE LICENSE.BSD LICENSE.MIT %manifest crash-worker.manifest %defattr(-,crash_worker,crash_worker,-) %dir %{crash_root_path} -%dir %{crash_path} -%dir %{crash_temp} %{_sysconfdir}/crash-manager.conf %{_sysconfdir}/crash-manager.conf.d/crash-manager.conf.example %attr(-,root,root) %{_prefix}/lib/sysctl.d/70-crash-manager.conf -- 2.7.4 From 146801388bd663800ae00c08e8a496f2ab11662d Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 4 Feb 2021 16:03:15 +0100 Subject: [PATCH 13/16] crash-manager, service: Set a restrictive umask Setting such a mask will make any files created on ocassion (such as temporary files) unreadable by others. Change-Id: I6843a49cb123a663effb1ab99e8118e968786624 --- include/defs.h.in | 1 + src/crash-manager/main.c | 4 ++++ src/crash-service/crash-service.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/include/defs.h.in b/include/defs.h.in index a3196cf..8c0760a 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -2,6 +2,7 @@ #define __DEFS_H__ #define KERNEL_DEFINED_TASK_COMM_LEN 16 // from include/linux/sched.h +#define DEFAULT_UMASK 0077 #define CRASH_PATH "@CRASH_PATH@" #define CRASH_ROOT_PATH "@CRASH_ROOT_PATH@" diff --git a/src/crash-manager/main.c b/src/crash-manager/main.c index e495500..994747c 100644 --- a/src/crash-manager/main.c +++ b/src/crash-manager/main.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "shared/log.h" @@ -261,6 +262,9 @@ int main(int argc, char *argv[]) { int res; + /* Have consinsent umask across invocations - from shell, crash-service, kernel */ + umask(DEFAULT_UMASK); + if (!drop_privileges(USER_NAME)) { res = EXIT_FAILURE; goto exit; diff --git a/src/crash-service/crash-service.c b/src/crash-service/crash-service.c index 0917fcb..ad0655e 100644 --- a/src/crash-service/crash-service.c +++ b/src/crash-service/crash-service.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -315,6 +316,9 @@ static bool dbus_init(void) int main(void) { + /* Have consinsent umask across invocations - from shell, crash-service, kernel */ + umask(DEFAULT_UMASK); + if (!have_livecoredumper()) { _E("livecoredumper not available - can not provide livedump API. Terminating.\n"); return EXIT_FAILURE; -- 2.7.4 From aac30ff4d266a208fe7c6919f1b48f7c17de6452 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Fri, 5 Feb 2021 11:47:31 +0100 Subject: [PATCH 14/16] Set permissions explicitly for directories and reports Change-Id: If01ddf2a7f73a6b808f3cd8d39f20a77c74231d3 --- include/defs.h.in | 2 ++ src/crash-manager/crash-manager.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/defs.h.in b/include/defs.h.in index 8c0760a..906b649 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -3,6 +3,8 @@ #define KERNEL_DEFINED_TASK_COMM_LEN 16 // from include/linux/sched.h #define DEFAULT_UMASK 0077 +#define DEFAULT_REPORT_PERM 0644 +#define DEFAULT_CRASH_DIR_PERM 0775 #define CRASH_PATH "@CRASH_PATH@" #define CRASH_ROOT_PATH "@CRASH_ROOT_PATH@" diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c index ea4c3b7..d3f4e98 100644 --- a/src/crash-manager/crash-manager.c +++ b/src/crash-manager/crash-manager.c @@ -262,14 +262,17 @@ static bool make_dump_dir(void) const char *dirname = dirs[i]; int r = mkdir(dirname, 0775); - if (r >= 0) - continue; - if (errno != EEXIST) { + if (r < 0 && errno != EEXIST) { _E("Unable to create directory %s: %m", dirname); return false; } + chmod(dirname, DEFAULT_CRASH_DIR_PERM); // Fixup permissions for directories created with bad umask + + if (r >= 0) + continue; + struct stat st = {0}; r = stat(dirname, &st); bool isdir = !!(st.st_mode & S_IFDIR); @@ -1177,9 +1180,10 @@ static bool move_dump_data(const char *from_path, const struct crash_info *cinfo if ((lock_fd = lock_dir(crash_dump_path, false)) < 0) return false; - if (!rename(from_path, cinfo->result_path)) + if (!rename(from_path, cinfo->result_path)) { + chmod(cinfo->result_path, DEFAULT_REPORT_PERM); clean_dump(); - else { + } else { _E("Failed to move %s to %s", from_path, cinfo->result_path); (void)check_disk_available(crash_dump_path, SPACE_REQUIRED_KB); is_ok = false; -- 2.7.4 From 003fd51d59b1601beb0229719cb745d49c8afb55 Mon Sep 17 00:00:00 2001 From: Mateusz Moscicki Date: Fri, 5 Feb 2021 12:55:31 +0100 Subject: [PATCH 15/16] Release 5.5.45 Change-Id: Ic316b6d6f3dc0436fbc8cc3c3b43b203b3b9fb0a --- packaging/crash-worker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index c7aec82..627718d 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -13,7 +13,7 @@ Name: crash-worker Summary: Coredump handler and report generator for Tizen -Version: 5.5.44 +Version: 5.5.45 Release: 1 Group: Framework/system License: Apache-2.0 and BSD-2-Clause and MIT -- 2.7.4 From 4f0d4ae7a0f69eff05b41a8f2c481d774638dba1 Mon Sep 17 00:00:00 2001 From: Kunhoon Baik Date: Sun, 21 Feb 2021 12:39:22 +0900 Subject: [PATCH 16/16] Re-create crash_path for compatibilities. The crash_path should be installed at image creation time for several Tizen testing infras. Until Tizen testing infras will be modified, the crash_path should be remained. Change-Id: Iea7166e87a2dbd3b55bb95f8d8a492d17dec50a0 --- packaging/crash-worker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 627718d..951ab2b 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -161,9 +161,12 @@ make doc rm -rf %{buildroot} %make_install mkdir -p %{buildroot}%{crash_root_path} +mkdir -p %{buildroot}%{crash_path} %post chsmack -a "System" -t %{crash_root_path} +chsmack -a "System" -t %{crash_path} + if [ $1 -eq 2 ] ; then # All directories are created with appropriate permissions by # crash-manager/service (0775) and with correct label (System) @@ -172,7 +175,6 @@ if [ $1 -eq 2 ] ; then # # Following is only for package-based upgrade in Tizen 6.5 # Drop this in Tizen 7.0 - chsmack -a "System" -t %{crash_path} chsmack -a "System" -t %{crash_temp} fi @@ -181,6 +183,7 @@ fi %manifest crash-worker.manifest %defattr(-,crash_worker,crash_worker,-) %dir %{crash_root_path} +%attr(0775,crash_worker,crash_worker) %{crash_path} %{_sysconfdir}/crash-manager.conf %{_sysconfdir}/crash-manager.conf.d/crash-manager.conf.example %attr(-,root,root) %{_prefix}/lib/sysctl.d/70-crash-manager.conf -- 2.7.4