diff options
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch new file mode 100644 index 0000000000..bd9169381f --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/debugedit-segv.patch @@ -0,0 +1,35 @@ +There are cases, especially on PPC and MIPS, where the data address +returned is 0, but the size is not 0. + +It appears to happen when the sections headers are similar to: + + [21] .data PROGBITS 000239c0 0139c0 000010 00 WA 0 0 8 + [22] .got PROGBITS 000239d0 0139d0 000014 04 WAX 0 0 4 + [23] .plt NOBITS 000239e4 0139e4 000234 00 WAX 0 0 4 + [24] .bss NOBITS 00023c18 0139e4 0001c8 00 WA 0 0 8 + [25] .comment PROGBITS 00000000 0139e4 000011 01 MS 0 0 1 + [26] .debug_aranges PROGBITS 00000000 0139f8 000d68 00 0 0 8 + +Sections 23 and 24 (.plt and .bss) which are NOBITS have a loaded data address +of 0, but a size != 0. + +This could be a bug in libelf... + +Upstream-status: Pending + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.9/tools/debugedit.c +=================================================================== +--- rpm-5.4.9.orig/tools/debugedit.c ++++ rpm-5.4.9/tools/debugedit.c +@@ -1434,7 +1434,8 @@ handle_build_id (DSO *dso, Elf_Data *bui + auto inline void process (const void *data, size_t size) + { + memchunk chunk = { .data = (void *) data, .size = size }; +- hashFunctionContextUpdateMC (&ctx, &chunk); ++ if (data != NULL && size != 0) ++ hashFunctionContextUpdateMC (&ctx, &chunk); + } + union + { diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index ba24111bf7..e9c8f23c18 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -84,7 +84,8 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex file://python-rpm-rpmsense.patch \ file://rpm-reloc-macros.patch \ file://rpm-platform2.patch \ - file://rpm-remove-sykcparse-decl.patch \ + file://rpm-remove-sykcparse-decl.patch \ + file://debugedit-segv.patch \ " # Uncomment the following line to enable platform score debugging |