From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id DCB90385E013 for ; Tue, 24 Mar 2020 11:54:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DCB90385E013 Received: by mail-qk1-x744.google.com with SMTP id u4so7001800qkj.13 for ; Tue, 24 Mar 2020 04:54:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5ZiNxjQOQOJ+V+O9W8k5k8MThsEVoUNqVIsx8xgKpFI=; b=Lsl2MSBqaL4OnSzZozhy230oTHkqFYt7ZBRlldxpEt2STqJnNMOv7VzOZFKDL7tEpq aE6PLwLcYBU3Zo5AK/dtUSMRUgNLDgq+OvcN6k72b4piEb8GLsuVGUq3PJ373tddHes3 z7nlJqDnt6woPqj55BJyDg4Z5XbPXrkM9WOsdFfSAcat27mRjo1ynGUd6HWoOBiTQOwu RnfKtDZYojktWyzWuWbDUWF3rY7Rngm5fvjFjCFPFU813Ys82wneO8kLHgKRVL4fjr8z +abmHMBnPw/3EipuiB9363SP8eEx0IzoM/fPee/ecQkXdshCTyug9x2jiLfPirJllEXp UH3Q== X-Gm-Message-State: ANhLgQ29vaAnGRIGOwDuuWZ7Icc7AfEKP4MzWUWWagxrRB/7pXDsiaUK LjEUxoj2TsRefWXgeWlWfTjOf3kWLWI= X-Google-Smtp-Source: ADFU+vvaeZItyB0ElXTgIXOCMEEGSy5h7UOPCxFHL0fSXtO2Ksy3uGrqV/sVJNk7nW7MZ3csXvGFwg== X-Received: by 2002:a37:6cb:: with SMTP id 194mr20724864qkg.235.1585050897146; Tue, 24 Mar 2020 04:54:57 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id o81sm13302910qke.24.2020.03.24.04.54.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 04:54:56 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED] posix: Fix system error return value [BZ #25715] Date: Tue, 24 Mar 2020 08:52:50 -0300 Message-Id: <20200324115250.688467-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200324115250.688467-1-adhemerval.zanella@linaro.org> References: <20200324115250.688467-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-28.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 11:54:59 -0000 It fixes 5fb7fc9635 when posix_spawn fails. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Carlos O'Donell (cherry picked from commit f09542c584b121da0322fde4b55306d512b85d93) --- NEWS | 1 + stdlib/tst-system.c | 122 +++++++++++++++++++++++++++++++++++++++-- sysdeps/posix/system.c | 18 +++--- 3 files changed, 130 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index 1dabaf9329..9750aec834 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,7 @@ The following bugs are resolved with this release: [25487] sinl() stack corruption from crafted input (CVE-2020-10029) [25523] MIPS/Linux inline syscall template is miscompiled [25635] arm: Wrong sysdep order selection for soft-fp + [25715] system() returns wrong errors when posix_spawn fails Version 2.30 diff --git a/stdlib/tst-system.c b/stdlib/tst-system.c index 06afbf24c7..09a5c05cab 100644 --- a/stdlib/tst-system.c +++ b/stdlib/tst-system.c @@ -17,14 +17,128 @@ . */ #include +#include +#include +#include +#include +#include +#include +#include +#include + +static char *tmpdir; +static long int namemax; + +static void +do_prepare (int argc, char *argv[]) +{ + tmpdir = support_create_temp_directory ("tst-system-"); + /* Include the last '/0'. */ + namemax = pathconf (tmpdir, _PC_NAME_MAX) + 1; + TEST_VERIFY_EXIT (namemax != -1); +} +#define PREPARE do_prepare + +struct args +{ + const char *command; + int exit_status; + int term_sig; + const char *path; +}; + +static void +call_system (void *closure) +{ + struct args *args = (struct args *) closure; + int ret; + + if (args->path != NULL) + TEST_COMPARE (setenv ("PATH", args->path, 1), 0); + ret = system (args->command); + if (args->term_sig == 0) + { + /* Expect regular termination. */ + TEST_VERIFY (WIFEXITED (ret) != 0); + TEST_COMPARE (WEXITSTATUS (ret), args->exit_status); + } + else + { + /* status_or_signal < 0. Expect termination by signal. */ + TEST_VERIFY (WIFSIGNALED (ret) != 0); + TEST_COMPARE (WTERMSIG (ret), args->term_sig); + } +} static int do_test (void) { - return system (":"); -} + TEST_VERIFY (system (NULL) != 0); + { + char cmd[namemax]; + memset (cmd, 'a', sizeof(cmd)); + cmd[sizeof(cmd) - 1] = '\0'; + + struct support_capture_subprocess result; + result = support_capture_subprocess (call_system, + &(struct args) { + cmd, 127, 0, tmpdir + }); + support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr); + + char *returnerr = xasprintf ("%s: 1: %s: not found\n", + basename(_PATH_BSHELL), cmd); + TEST_COMPARE_STRING (result.err.buffer, returnerr); + free (returnerr); + } + + { + char cmd[namemax + 1]; + memset (cmd, 'a', sizeof(cmd)); + cmd[sizeof(cmd) - 1] = '\0'; + + struct support_capture_subprocess result; + result = support_capture_subprocess (call_system, + &(struct args) { + cmd, 127, 0, tmpdir + }); + support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr); + + char *returnerr = xasprintf ("%s: 1: %s: File name too long\n", + basename(_PATH_BSHELL), cmd); + TEST_COMPARE_STRING (result.err.buffer, returnerr); + free (returnerr); + } + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (call_system, + &(struct args) { + "kill -USR1 $$", 0, SIGUSR1 + }); + support_capture_subprocess_check (&result, "system", 0, sc_allow_none); + } + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (call_system, + &(struct args) { "echo ...", 0 }); + support_capture_subprocess_check (&result, "system", 0, sc_allow_stdout); + TEST_COMPARE_STRING (result.out.buffer, "...\n"); + } + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (call_system, + &(struct args) { "exit 1", 1 }); + support_capture_subprocess_check (&result, "system", 0, sc_allow_none); + } + + TEST_COMPARE (system (":"), 0); + + return 0; +} -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index a08d328b23..863d7c016f 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -97,7 +97,8 @@ cancel_handler (void *arg) static int do_system (const char *line) { - int status; + int status = -1; + int ret; pid_t pid; struct sigaction sa; #ifndef _LIBC_REENTRANT @@ -140,14 +141,14 @@ do_system (const char *line) __posix_spawnattr_setflags (&spawn_attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - status = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, - (char *const[]){ (char*) SHELL_NAME, - (char*) "-c", - (char *) line, NULL }, - __environ); + ret = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, + (char *const[]){ (char *) SHELL_NAME, + (char *) "-c", + (char *) line, NULL }, + __environ); __posix_spawnattr_destroy (&spawn_attr); - if (status == 0) + if (ret == 0) { /* Cancellation results in cleanup handlers running as exceptions in the block where they were installed, so it is safe to reference @@ -182,6 +183,9 @@ do_system (const char *line) } DO_UNLOCK (); + if (ret != 0) + __set_errno (ret); + return status; } -- 2.17.1