From patchwork Fri Apr 21 15:35:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 20114 Received: (qmail 80158 invoked by alias); 21 Apr 2017 18:29:10 -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 79790 invoked by uid 89); 21 Apr 2017 18:29:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f172.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=LmOs+Dt/P0KPkUX53R258d9Ra66GlhUee+fCajM122U=; b=mNDn9FUoxomSqksvHedQ7EpBtI6kMQhimHns6IcZi9s0IpfaCyEGuv5iK2hYBrSVNu owHee7TypZIChmXnT0HQU8OdHRIypS5ZZz0BeQ2G4XSNnD6i8ACqGWj0QjWt6aKWg/Gc 8Dy1GNMAD0tfzMnD5uzw1rRAE9j8P8Ycwsr461IV9pm0nrlLp1BBDFKeNArD23FcVxqp J+yylRAYxWEuXS9Zzi4yifcusMkoyA3BXRio+HXqBGEL8purFGPL4b18BIZzOQo6ShKD gDSV7rEbLp5Ded+q9GhBGAJfqGGVC8s8ptUHifR3RNfW3JVT2tCiVOstiZk7YMjX5QIh oxFQ== X-Gm-Message-State: AN3rC/4e8bUR8k7pn27olWK2J5Xu4S8Hjconosz7GqksRHgFeYbMQnae yvE07lp1nUh7Mnys X-Received: by 10.55.76.12 with SMTP id z12mr14703515qka.205.1492788927613; Fri, 21 Apr 2017 08:35:27 -0700 (PDT) Subject: Re: [PATCH v3][BZ 21340] add support for POSIX_SPAWN_SETSID To: Florian Weimer , libc-alpha@sourceware.org References: <20170405054116.9007-1-quae@daurnimator.com> <75eb12d0-a3f1-2b37-90d5-0a9a3f7f9a99@redhat.com> Cc: Zack Weinberg From: Adhemerval Zanella Message-ID: Date: Fri, 21 Apr 2017 12:35:22 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: On 21/04/2017 11:24, Florian Weimer wrote: > On 04/21/2017 04:13 PM, Adhemerval Zanella wrote: > >> * conform/data/spawn.h-data: Add POSIX_SPAWN_SETSID flag. > > I think this has to go away ... > > >> diff --git a/posix/spawn.h b/posix/spawn.h >> index 36e3867..8d2ace1 100644 >> --- a/posix/spawn.h >> +++ b/posix/spawn.h >> @@ -60,6 +60,7 @@ typedef struct >> #ifdef __USE_GNU >> # define POSIX_SPAWN_USEVFORK 0x40 >> #endif >> +#define POSIX_SPAWN_SETSID 0x80 > > > ... because this has to be governed by __GNU_SOURCE. > >> +static int >> +do_test (void) >> +{ >> + pid_t sid, child_sid; >> + int res; >> + >> + /* Current session ID. */ >> + sid = getsid(0); >> + if (sid == (pid_t) -1) >> + FAIL_EXIT1 ("getsid (0): %m"); >> + >> + posix_spawnattr_t attrp; >> + posix_spawnattr_init (&attrp); >> + if (posix_spawnattr_setflags (&attrp, POSIX_SPAWN_SETSID)) >> + FAIL_EXIT1 ("posix_spawnattr_setflags: %m"); > > Please run the test twice, once with setting POSIX_SPAWN_SETSID, and once without. > > Thanks, > Florian I think this iteration should fix the issues you bring. --- Daurnimator Adhemerval Zanella [BZ #21340] * posix/Makefile (tests): Add tst-posix_spawn-setsid to list of tests. * posix/spawn.h: define POSIX_SPAWN_SETSID flag. * posix/spawnattr_setflags.c (ALL_FLAGS): Add POSIX_SPAWN_SETSID to valid flags. * posix/tst-posix_spawn-setsid.c: Add test for POSIX_SPAWN_SETSID. * sysdeps/mach/hurd/spawni.c (__spawni): Implementation of POSIX_SPAWN_SETSID. * sysdeps/posix/spawni.c (__spawni): Likewise. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise. --- diff --git a/posix/Makefile b/posix/Makefile index a6586ea..0fc509c 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -91,7 +91,7 @@ tests := test-errno tstgetopt testfnm runtests runptests \ bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ tst-pathconf tst-getaddrinfo4 tst-rxspencer-no-utf8 \ tst-fnmatch3 bug-regex36 tst-getaddrinfo5 \ - tst-posix_spawn-fd \ + tst-posix_spawn-fd tst-posix_spawn-setsid \ tst-posix_fadvise tst-posix_fadvise64 xtests := bug-ga2 ifeq (yes,$(build-shared)) diff --git a/posix/spawn.h b/posix/spawn.h index 36e3867..a1154a3 100644 --- a/posix/spawn.h +++ b/posix/spawn.h @@ -59,6 +59,7 @@ typedef struct #define POSIX_SPAWN_SETSCHEDULER 0x20 #ifdef __USE_GNU # define POSIX_SPAWN_USEVFORK 0x40 +# define POSIX_SPAWN_SETSID 0x80 #endif diff --git a/posix/spawnattr_setflags.c b/posix/spawnattr_setflags.c index 9b3d1e0..62d2f00 100644 --- a/posix/spawnattr_setflags.c +++ b/posix/spawnattr_setflags.c @@ -25,6 +25,7 @@ | POSIX_SPAWN_SETSIGMASK \ | POSIX_SPAWN_SETSCHEDPARAM \ | POSIX_SPAWN_SETSCHEDULER \ + | POSIX_SPAWN_SETSID \ | POSIX_SPAWN_USEVFORK) /* Store flags in the attribute structure. */ diff --git a/posix/tst-posix_spawn-setsid.c b/posix/tst-posix_spawn-setsid.c new file mode 100644 index 0000000..c2d9534 --- /dev/null +++ b/posix/tst-posix_spawn-setsid.c @@ -0,0 +1,92 @@ +/* Test posix_spawn setsid attribute. + Copyright (C) 2017 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 + +static int +do_test_setsid (bool test_setsid) +{ + pid_t sid, child_sid; + int res; + + /* Current session ID. */ + sid = getsid(0); + if (sid == (pid_t) -1) + FAIL_EXIT1 ("getsid (0): %m"); + + posix_spawnattr_t attrp; + /* posix_spawnattr_init should not fail (it basically memset the + attribute). */ + posix_spawnattr_init (&attrp); + if (test_setsid) + { + if (posix_spawnattr_setflags (&attrp, POSIX_SPAWN_SETSID)) + FAIL_EXIT1 ("posix_spawnattr_setflags: %m"); + } + + /* Program to run. */ + char *args[2] = { (char *) "true", NULL }; + pid_t child; + + res = posix_spawnp (&child, "true", NULL, &attrp, args, environ); + /* posix_spawnattr_destroy is noop. */ + posix_spawnattr_destroy (&attrp); + + if (res != 0) + FAIL_EXIT1 ("posix_spawnp: %m"); + + /* Child should have a different session ID than parent. */ + child_sid = getsid (child); + + if (child_sid == (pid_t) -1) + FAIL_EXIT1 ("getsid (%i): %m", child); + + if (test_setsid) + { + if (child_sid == sid) + FAIL_EXIT1 ("child session ID matched parent one"); + } + else + { + if (child_sid != sid) + FAIL_EXIT1 ("child session ID did not match parent one"); + } + + return 0; +} + +static int +do_test (void) +{ + int ret = 0; + + ret += do_test_setsid (false); + ret += do_test_setsid (true); + + return 0; +} + +#include diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c index 284875a..7430383 100644 --- a/sysdeps/mach/hurd/spawni.c +++ b/sysdeps/mach/hurd/spawni.c @@ -281,6 +281,9 @@ __spawni (pid_t *pid, const char *file, } #endif + if (!err && (flags & POSIX_SPAWN_SETSID) != 0) + err = __proc_setsid (proc); + /* Set the process group ID. */ if (!err && (flags & POSIX_SPAWN_SETPGROUP) != 0) err = __proc_setpgrp (proc, new_pid, attrp->__pgrp); diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c index 5cc2ad1..9cad25c 100644 --- a/sysdeps/posix/spawni.c +++ b/sysdeps/posix/spawni.c @@ -101,7 +101,8 @@ __spawni (pid_t *pid, const char *file, to POSIX. */ || ((flags & (POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER - | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_RESETIDS)) == 0 + | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_RESETIDS + | POSIX_SPAWN_SETSID)) == 0 && file_actions == NULL)) new_pid = __vfork (); else @@ -159,6 +160,10 @@ __spawni (pid_t *pid, const char *file, } #endif + if ((flags & POSIX_SPAWN_SETSID) != 0 + && __setsid () < 0) + _exit (SPAWN_ERROR); + /* Set the process group ID. */ if ((flags & POSIX_SPAWN_SETPGROUP) != 0 && __setpgid (0, attrp->__pgrp) != 0) diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index d7f9e83..3cf77d5 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -177,6 +177,10 @@ __spawni_child (void *arguments) } #endif + if ((attr->__flags & POSIX_SPAWN_SETSID) != 0 + && (ret = __setsid ()) < 0) + goto fail; + /* Set the process group ID. */ if ((attr->__flags & POSIX_SPAWN_SETPGROUP) != 0 && (ret = __setpgid (0, attr->__pgrp)) != 0)