summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2025-05-21 08:43:32 +0200
committerFlorian Weimer <fweimer@redhat.com>2025-05-21 09:02:10 +0200
commit9403232d98c3328a3b3944334ebdbeea01481af2 (patch)
tree64000a76065e6bb49dd07800e7573cc7804b15bd
parent02809c23a3e5a55e4c47692b935f02e712afca30 (diff)
elf: Fix subprocess status handling for tst-dlopen-sgid (bug 32987)
This should really move into support_capture_subprogram_self_sgid. Reviewed-by: Sam James <sam@gentoo.org> (cherry picked from commit 35fc356fa3b4f485bd3ba3114c9f774e5df7d3c2)
-rw-r--r--NEWS1
-rw-r--r--elf/tst-dlopen-sgid.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 96ff2c8a20..5efe374819 100644
--- a/NEWS
+++ b/NEWS
@@ -113,6 +113,7 @@ The following bugs are resolved with this release:
[32231] elf: Change ldconfig auxcache magic number
[32470] x86: Avoid integer truncation with large cache sizes
[32582] Fix underallocation of abort_msg_s struct (CVE-2025-0395)
+ [32987] elf: Fix subprocess status handling for tst-dlopen-sgid
Version 2.36
diff --git a/elf/tst-dlopen-sgid.c b/elf/tst-dlopen-sgid.c
index 47829a405e..5688b79f2e 100644
--- a/elf/tst-dlopen-sgid.c
+++ b/elf/tst-dlopen-sgid.c
@@ -26,6 +26,8 @@
#include <support/check.h>
#include <support/support.h>
#include <support/temp_file.h>
+#include <support/test-driver.h>
+#include <sys/wait.h>
#include <unistd.h>
/* This is the name of our test object. Use a custom module for
@@ -66,10 +68,16 @@ do_test (void)
free (from);
}
- TEST_COMPARE (support_capture_subprogram_self_sgid (magic_argument), 0);
-
free (libdir);
+ int status = support_capture_subprogram_self_sgid (magic_argument);
+
+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
+ return EXIT_UNSUPPORTED;
+
+ if (!WIFEXITED (status))
+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
+
return 0;
}