From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 6 Dec 2021 11:45:25 +0000 (+0100)
Subject: Merge pull request #21454 from bluca/inspect_elf
X-Git-Tag: v250-rc1~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec1574cd8ed6a7ca3386eca61aae92ce989b1f05;p=thirdparty%2Fsystemd.git

Merge pull request #21454 from bluca/inspect_elf

analyze: add inspect-elf verb to parse package metadata
---

ec1574cd8ed6a7ca3386eca61aae92ce989b1f05
diff --cc src/shared/elf-util.c
index 084920a5015,256744ce955..dafd219bb25
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@@ -604,13 -735,10 +735,13 @@@ int parse_elf_object(int fd, const cha
          }
          if (r == 0) {
                  /* We want to avoid loops, given this can be called from systemd-coredump */
 -                if (fork_disable_dump)
 -                        prctl(PR_SET_DUMPABLE, 0);
 +                if (fork_disable_dump) {
 +                        r = RET_NERRNO(prctl(PR_SET_DUMPABLE, 0));
 +                        if (r < 0)
 +                                goto child_fail;
 +                }
  
-                 r = parse_core(fd, executable, ret ? &buf : NULL, ret_package_metadata ? &package_metadata : NULL);
+                 r = parse_elf(fd, executable, ret ? &buf : NULL, ret_package_metadata ? &package_metadata : NULL);
                  if (r < 0)
                          goto child_fail;