]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
linux-user/main: Check errno when getting AT_EXECFD
authorVivian Wang <uwu@dram.page>
Tue, 23 Jul 2024 10:05:45 +0000 (18:05 +0800)
committerRichard Henderson <richard.henderson@linaro.org>
Mon, 29 Jul 2024 21:59:23 +0000 (07:59 +1000)
It's possible for AT_EXECFD to end up with a valid value of 0. Check
errno when using qemu_getauxval instead of return value to handle this
case.

Not handling this case leads to a confusing condition where the
executable ends up as fd 0, i.e. stdin.

Signed-off-by: Vivian Wang <uwu@dram.page>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Fixes: 0b959cf5e4cc ("linux-user: Use qemu_getauxval for AT_EXECFD")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2448
Message-ID: <20240723100545.405476-3-uwu@dram.page>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
linux-user/main.c

index 7d3cf45fa9ead08284e6eb35105f44204d882fe7..8143a0d4b02f5b97769b3cf1d050c4e655da91d8 100644 (file)
@@ -755,8 +755,9 @@ int main(int argc, char **argv, char **envp)
     /*
      * Manage binfmt-misc open-binary flag
      */
+    errno = 0;
     execfd = qemu_getauxval(AT_EXECFD);
-    if (execfd == 0) {
+    if (errno != 0) {
         execfd = open(exec_path, O_RDONLY);
         if (execfd < 0) {
             printf("Error while loading %s: %s\n", exec_path, strerror(errno));