From ec6417a5883cc03314267dafc3e870e4f44a0660 Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Fri, 1 Sep 2023 14:36:03 +0800 Subject: [PATCH] Use upstream patch for Fix error of parsing object file perms (cherry picked from commit 61613e52ec045bc07c2e72b91301b773b8b9011c) --- Fix-error-of-parsing-object-file-perms.patch | 46 ------------- ...ectly-decode-ar_mode-as-octal-string.patch | 64 +++++++++++++++++++ elfutils.spec | 10 ++- 3 files changed, 72 insertions(+), 48 deletions(-) delete mode 100644 Fix-error-of-parsing-object-file-perms.patch create mode 100644 backport-libelf-Correctly-decode-ar_mode-as-octal-string.patch diff --git a/Fix-error-of-parsing-object-file-perms.patch b/Fix-error-of-parsing-object-file-perms.patch deleted file mode 100644 index cf487ab..0000000 --- a/Fix-error-of-parsing-object-file-perms.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9e18fcfeb2c8ff471c11da58b05215e219be20fd Mon Sep 17 00:00:00 2001 -From: yixiangzhike -Date: Tue, 16 Aug 2022 09:49:35 +0800 -Subject: [PATCH] fix error of parsing object file perms - ---- - libelf/elf_begin.c | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c -index 17d9b1f..581d8ef 100644 ---- a/libelf/elf_begin.c -+++ b/libelf/elf_begin.c -@@ -997,10 +997,28 @@ __libelf_next_arhdr_wrlock (Elf *elf) - } \ - while (0) - -+#define INT_FIELD_HN(FIELD, HN) \ -+ do \ -+ { \ -+ char buf[sizeof (ar_hdr->FIELD) + 1]; \ -+ const char *string = ar_hdr->FIELD; \ -+ if (ar_hdr->FIELD[sizeof (ar_hdr->FIELD) - 1] != ' ') \ -+ { \ -+ *((char *) mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD))) \ -+ = '\0'; \ -+ string = buf; \ -+ } \ -+ if (sizeof (elf_ar_hdr->FIELD) <= sizeof (long int)) \ -+ elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtol (string, NULL, HN); \ -+ else \ -+ elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtoll (string, NULL, HN); \ -+ } \ -+ while (0) -+ - INT_FIELD (ar_date); - INT_FIELD (ar_uid); - INT_FIELD (ar_gid); -- INT_FIELD (ar_mode); -+ INT_FIELD_HN (ar_mode, 8); - INT_FIELD (ar_size); - - if (elf_ar_hdr->ar_size < 0) --- -2.27.0 - diff --git a/backport-libelf-Correctly-decode-ar_mode-as-octal-string.patch b/backport-libelf-Correctly-decode-ar_mode-as-octal-string.patch new file mode 100644 index 0000000..6f2513d --- /dev/null +++ b/backport-libelf-Correctly-decode-ar_mode-as-octal-string.patch @@ -0,0 +1,64 @@ +From ee188125b10d1588a0536af033d7b7b1bbbaafaf Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sun, 28 Aug 2022 19:51:13 +0200 +Subject: [PATCH] libelf: Correctly decode ar_mode as octal string + +ar_mode is encoded as an octal ascii string, not decimal. Add a new +OCT_FIELD macro to decode it. + +https://sourceware.org/bugzilla/show_bug.cgi?id=28729 + +Signed-off-by: Mark Wielaard +--- + libelf/elf_begin.c | 25 +++++++++++++++++++++++-- + 1 files changed, 23 insertions(+), 2 deletions(-) + +diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c +index 17d9b1f3..71eb3594 100644 +--- a/libelf/elf_begin.c ++++ b/libelf/elf_begin.c +@@ -977,7 +977,8 @@ __libelf_next_arhdr_wrlock (Elf *elf) + atoll depending on the size of the types. We are also prepared + for the case where the whole field in the `struct ar_hdr' is + filled in which case we cannot simply use atol/l but instead have +- to create a temporary copy. */ ++ to create a temporary copy. Note that all fields use decimal ++ encoding, except ar_mode which uses octal. */ + + #define INT_FIELD(FIELD) \ + do \ +@@ -997,10 +998,30 @@ __libelf_next_arhdr_wrlock (Elf *elf) + } \ + while (0) + ++#define OCT_FIELD(FIELD) \ ++ do \ ++ { \ ++ char buf[sizeof (ar_hdr->FIELD) + 1]; \ ++ const char *string = ar_hdr->FIELD; \ ++ if (ar_hdr->FIELD[sizeof (ar_hdr->FIELD) - 1] != ' ') \ ++ { \ ++ *((char *) mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD))) \ ++ = '\0'; \ ++ string = buf; \ ++ } \ ++ if (sizeof (elf_ar_hdr->FIELD) <= sizeof (long int)) \ ++ elf_ar_hdr->FIELD \ ++ = (__typeof (elf_ar_hdr->FIELD)) strtol (string, NULL, 8); \ ++ else \ ++ elf_ar_hdr->FIELD \ ++ = (__typeof (elf_ar_hdr->FIELD)) strtoll (string, NULL, 8); \ ++ } \ ++ while (0) ++ + INT_FIELD (ar_date); + INT_FIELD (ar_uid); + INT_FIELD (ar_gid); +- INT_FIELD (ar_mode); ++ OCT_FIELD (ar_mode); + INT_FIELD (ar_size); + + if (elf_ar_hdr->ar_size < 0) +-- +2.27.0 + diff --git a/elfutils.spec b/elfutils.spec index 166cca6..cb65ce0 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ # -*- rpm-spec from http://elfutils.org/ -*- Name: elfutils Version: 0.185 -Release: 17 +Release: 18 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data URL: http://elfutils.org/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -9,7 +9,7 @@ Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2 Patch0: backport-elfclassify-Fix-no-stdin-flag.patch Patch1: Fix-segfault-in-eu-ar-m.patch -Patch2: Fix-error-of-parsing-object-file-perms.patch +Patch2: backport-libelf-Correctly-decode-ar_mode-as-octal-string.patch Patch3: Fix-issue-of-moving-files-by-ar-or-br.patch Patch4: Get-instance-correctly-for-eu-ar-N-option.patch Patch5: backport-readelf-Handle-DW_LLE_GNU_view_pair.patch @@ -267,6 +267,12 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Fri Sep 01 2023 fuanan - 0.185-18 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Use upstream patch for Fix error of parsing object file perms + * Mon Dec 5 2022 linzhuorong - 0.185-17 - Type:bugfix - ID:NA