From patchwork Fri Sep 16 21:16:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 76432 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp688703qgf; Fri, 16 Sep 2016 14:16:56 -0700 (PDT) X-Received: by 10.66.144.5 with SMTP id si5mr19794101pab.158.1474060615991; Fri, 16 Sep 2016 14:16:55 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id vy1si2618592pab.148.2016.09.16.14.16.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 14:16:55 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-73315-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-73315-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-73315-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=AzSeVWT29jl+xJp8z3MJWt9/bsFOknANwRCVmxvmuXD92XIT8kLG5 HhyvLMJFq8ihDJE4zO06sOyHjvl/cVg1RPr0jvifcRCpC+bGxsxctncj5mFbt9fE I3LDhwtNQTRuPqrzMwJyNygj9aDwtbH7r6byR0RZN9v7MTQlrW35hs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=7hra3KcXl/iVVeqoWlL5o5xM+Z4=; b=kw0pBpAw0xwJ9iEOToBk6nd81ycv VkUUi1SEiv7LVGEQp1sQwM9bcQ6dXTa46PgEm0uMo/b70oD2TzurHH3FkU/2/Jev wNClxbYJgP5ikG1xUCKD58F2EpgCNezrO2IxnM14NvMrjGm5UuGZlWHadNzIakQO ZUGwIZbxusoXAXg= Received: (qmail 86229 invoked by alias); 16 Sep 2016 21:16:44 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 86212 invoked by uid 89); 16 Sep 2016 21:16:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Close, states X-HELO: mail-yw0-f182.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=TnUg0GzeJZs9blowsosQPP2BrpdCvinS1L5SXdDtiqA=; b=i5FmFM7AROXwzMdn60fbjM2AA5Q8eAoPPxcFJhjF9O7Xl4DK0Ss3y/mlJm/Zavt2rG UqFwkyRHupvgGXfsdVCRImtUKmeTIq375/ANmH4ZKKxW/xWn5enHX7CUgalaL0hKv2lo L9dzXAosWdZSW2xI+4P1qYChPZRJ/EZ9GwIuLSub+RwOjXIYWnL2DncKzZ6hih6IBGcs foT539pQqxh0zW0xaUNSPDmLD2lKVzAHj3de2GIx1bEsRDjfCNXjeac89K5CfOI2XCZk ofzI5jbUqPP4yc4n8TLT39WcwP8DcShaJumvt7nqp9313azghz9blif1LI+Hz9/QeHxY sMUw== X-Gm-Message-State: AE9vXwPcj7FSQ7znF2kO29bPZdEVEmDUBHb8mWMeRUBTVfbu3h8/yQRbC6wI6+C1mhPDxqXv X-Received: by 10.129.116.137 with SMTP id p131mr17032051ywc.164.1474060590349; Fri, 16 Sep 2016 14:16:30 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] posix: Fix open file action for posix_spawn on Linux Date: Fri, 16 Sep 2016 18:16:23 -0300 Message-Id: <1474060583-1277-1-git-send-email-adhemerval.zanella@linaro.org> On posix_spawn open file action (issued by posix_spawn_file_actions_addopen) POSIX states that if fildes was already an open file descriptor, it shall be closed before the new file is openedi [1]. This avoid pontential issues when posix_spawn plus addopen action is called with the process already at maximum number of file descriptor opened and also for multiple actions on single-open special paths (like /dev/watchdog). This fixes its behavior on Linux posix_spawn implementation and also adds a tests to check for its behavior. Checked on x86_64. * posix/Makefile (tests): Add tst-spawn3. * posix/tst-spawn3.c: New file. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Close file descriptor if it is already opened for open action. [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_spawn_file_actions_addclose.html --- posix/Makefile | 2 +- posix/tst-spawn3.c | 189 +++++++++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/spawni.c | 9 ++ 4 files changed, 204 insertions(+), 1 deletion(-) create mode 100644 posix/tst-spawn3.c -- 2.7.4 diff --git a/posix/Makefile b/posix/Makefile index 3a7719e..586d45b 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -94,7 +94,7 @@ tests := tstgetopt testfnm runtests runptests \ xtests := bug-ga2 ifeq (yes,$(build-shared)) test-srcs := globtest -tests += wordexp-test tst-exec tst-spawn tst-spawn2 +tests += wordexp-test tst-exec tst-spawn tst-spawn2 tst-spawn3 endif tests-static = tst-exec-static tst-spawn-static tests += $(tests-static) diff --git a/posix/tst-spawn3.c b/posix/tst-spawn3.c new file mode 100644 index 0000000..e66c491 --- /dev/null +++ b/posix/tst-spawn3.c @@ -0,0 +1,189 @@ +/* Check posix_spawn add file actions. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int do_test (void); +#define TEST_FUNCTION do_test () +#include + +static int +do_test (void) +{ + /* The test checks if posix_spawn open file action close the file descriptor + before opening a new one in case the input file descriptor is already + opened. It does by exhausting all file descriptors on the process before + issue posix_spawn. It then issues a posix_spawn for '/bin/sh echo $$' + and add two rules: + + 1. Redirect stdout to a temporary filepath + 2. Redirect stderr to stdout + + If the implementation does not close the file 1. will fail with + EMFILE. */ + + struct rlimit rl; + int max_fd = 24; + + /* Set maximum number of file descriptor to a low value to avoid open + too many files in environments where RLIMIT_NOFILE is large and to + limit the array size to track the opened file descriptors. */ + + if (getrlimit (RLIMIT_NOFILE, &rl) == -1) + { + printf ("error: getrlimit RLIMIT_NOFILE failed"); + exit (EXIT_FAILURE); + } + + max_fd = (rl.rlim_cur < max_fd ? rl.rlim_cur : max_fd); + rl.rlim_cur = max_fd; + + if (setrlimit (RLIMIT_NOFILE, &rl) == 1) + { + printf ("error: setrlimit RLIMIT_NOFILE to %u failed", max_fd); + exit (EXIT_FAILURE); + } + + /* Exhauste the file descriptor limit with temporary files. */ + int files[max_fd]; + int nfiles = 0; + for (;;) + { + int fd = create_temp_file ("tst-spawn3.", NULL); + if (fd == -1) + { + if (errno != EMFILE) + { + printf ("error: create_temp_file returned -1 with " + "errno != EMFILE\n"); + exit (EXIT_FAILURE); + } + break; + } + files[nfiles++] = fd; + } + + posix_spawn_file_actions_t a; + if (posix_spawn_file_actions_init (&a) != 0) + { + puts ("error: spawn_file_actions_init failed"); + exit (EXIT_FAILURE); + } + + /* Executes a /bin/sh echo $$ 2>&1 > /tmp/tst-spawn3.pid . */ + const char pidfile[] = "/tmp/tst-spawn3.pid"; + if (posix_spawn_file_actions_addopen (&a, STDOUT_FILENO, pidfile, O_WRONLY | + O_CREAT | O_TRUNC, 0644) != 0) + { + puts ("error: spawn_file_actions_addopen failed"); + exit (EXIT_FAILURE); + } + + if (posix_spawn_file_actions_adddup2 (&a, STDOUT_FILENO, STDERR_FILENO) != 0) + { + puts ("error: spawn_file_actions_addclose"); + exit (EXIT_FAILURE); + } + + /* Since execve (called by posix_spawn) might require to open files to + actually execute the shell script, setup to close the temporary file + descriptors. */ + for (int i=0; iaction.open_action.fd)) + close_not_cancel (action->action.open_action.fd); + ret = open_not_cancel (action->action.open_action.path, action->action. open_action.oflag | O_LARGEFILE,