]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #21454 from bluca/inspect_elf
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 6 Dec 2021 11:45:25 +0000 (12:45 +0100)
committerGitHub <noreply@github.com>
Mon, 6 Dec 2021 11:45:25 +0000 (12:45 +0100)
analyze: add inspect-elf verb to parse package metadata

1  2 
meson.build
src/analyze/analyze.c
src/shared/elf-util.c
test/units/testsuite-65.sh

diff --cc meson.build
Simple merge
Simple merge
index 084920a501556d6c6fec5c61d7717a1004175f00,256744ce9556f752bf8b347888645b461573d6e0..dafd219bb2553ca61e7676003af901391982a989
@@@ -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;
  
Simple merge