From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 5846B3858424 for ; Mon, 15 Jan 2024 14:06:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5846B3858424 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5846B3858424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705327574; cv=none; b=W71uFqXJAEkrJySr32C32R6PSwOtvKS/HzbEQ156TPSCJvk93XqW7h3PTOk2kwi/vNwWIbl5RScXGNpQTCqDBvLTq07hVoamKIlTyAH3YkSA+F8vgipGj0bFbJgBq170HzFZsreF/M7rVhKcj7PA/uLm/p9QiOrDgj/TTalMeZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705327574; c=relaxed/simple; bh=yzQKSKHoEkUzhFTUD6zs5w9oS0ZHQycjBq+dmadkccY=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=d/igDmHyWhhssknbSlSWucaB3uGmoRV4vUZZNKqdPFo8Gy/l7EMRu1Jn7aHA3djOf54Cok+Nu1M9D/RvBP7xfFukIjiQlmEkCUgCjLKk34CLAmT59lilVbljdS/4BB6IokOIXat/wi1iEWi5jwW+ihTNuWpEOm0VmXziEAmXGNA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705327571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=P73FEk5qXJBfYo06ywl2Ig4S4sGc4AHcny42OXSXnp0=; b=FSfyHzGk0ao9bUoN/q1jNp+q6NJTUAN6MnUe1F+1o0g6HuKyDdsqHmm2vKOtzniItcK0vF UAvLno3TMoH/ovKv6t89vH3NMkGDXgwkMkM/qnskEvtMmdwyMUToOk1yQ1oAqbnIM7gFJp //W5hCVMqhqjpS3t2n2uzpl89QPAy9I= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-W2Wjw2CqP_W8QJAcA8WMDA-1; Mon, 15 Jan 2024 09:06:09 -0500 X-MC-Unique: W2Wjw2CqP_W8QJAcA8WMDA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97C7138143BD for ; Mon, 15 Jan 2024 14:06:09 +0000 (UTC) Received: from oak (unknown [10.22.32.220]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B5ED492BC8 for ; Mon, 15 Jan 2024 14:06:09 +0000 (UTC) Date: Mon, 15 Jan 2024 09:06:08 -0500 From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Subject: Re: [PATCH v7] posix: Deprecate group_member for Linux Message-ID: <20240115140547.GG3179278@oak> References: <20231213152931.3489354-1-josimmon@redhat.com> MIME-Version: 1.0 In-Reply-To: <20231213152931.3489354-1-josimmon@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping. On Wed, Dec 13, 2023 at 10:29:25AM -0500, Joe Simmons-Talbott wrote: > The alloca usage in group_member could lead to stack overflow on Linux. > Removing the alloca usage would require group_member to handle the error > condition where memory could not be allocated and that cannot be done > since group_member returns a boolean value. Thus deprecate group_member. > Add an internal only implementation of __group_member2 using a > scratch_buffer and return -1 for memory allocation errors. Use > __group_member2 for in place of __group_member internally. Add testcases > for both group_member and __group_member2. > --- > Changes to v6: > * Use the intial scratch_buffer size as the starting point for > determining how much space is needed to store the group list. > * Call getgroups() with a zero size and set the scratch_buffer size > based on the returned number of groups. > > Changes to v5: > * Add __group_member2 and use it internally in the place of the now > deprecated group_member. > * Add a testcase for __group_member2. > > Changes to v4: > * Rebase onto latest commit. > > Changes to v3: > * Fix include guards to match file location _BITS_GROUP_MEMBER_H > * Fix indentation of preprocessor directives > > Changes to v2: > * Move the linux group_member.h to the bits directory > * Include the correct group_member.h in posix/unistd.h > > Changes to v1: > * Add NEWS entry > * Move group_member.h to bits/group_member.h > * Include bits/group_member.h in installed headers > * Add tests to group_member.h files to only be included from unistd.h > NEWS | 4 ++ > bits/group_member.h | 31 +++++++++++++++ > include/unistd.h | 1 + > posix/Makefile | 8 ++++ > posix/group_member.c | 35 +++++++++++++++++ > posix/tst-group_member.c | 41 ++++++++++++++++++++ > posix/tst-group_member2.c | 43 +++++++++++++++++++++ > posix/unistd.h | 6 +-- > sysdeps/posix/euidaccess.c | 9 ++++- > sysdeps/unix/sysv/linux/bits/group_member.h | 32 +++++++++++++++ > sysdeps/unix/sysv/linux/faccessat.c | 8 +++- > 11 files changed, 212 insertions(+), 6 deletions(-) > create mode 100644 bits/group_member.h > create mode 100644 posix/tst-group_member.c > create mode 100644 posix/tst-group_member2.c > create mode 100644 sysdeps/unix/sysv/linux/bits/group_member.h > > diff --git a/NEWS b/NEWS > index 3f0dee4fcc..032c5ff83d 100644 > --- a/NEWS > +++ b/NEWS > @@ -68,6 +68,10 @@ Deprecated and removed features, and other changes affecting compatibility: > of GNU libc are advised to check whether their build processes can be > simplified. > > +* Deprecated group_member on Linux as it uses alloca to allocate a large > + buffer and has no capability for indicating failure for other memory > + allocations. > + > Changes to build and runtime requirements: > > * Building on LoongArch requires at a minimum binutils 2.41 for vector > diff --git a/bits/group_member.h b/bits/group_member.h > new file mode 100644 > index 0000000000..7c43e7ee06 > --- /dev/null > +++ b/bits/group_member.h > @@ -0,0 +1,31 @@ > +/* group_member declaration > + Copyright (C) 2023 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 > + . */ > + > +#ifndef _UNISTD_H > +# error "Never use directly; include instead." > +#endif > + > +#ifndef _BITS_GROUP_MEMBER_H > +# define _BITS_GROUP_MEMBER_H 1 > + > +# ifdef __USE_GNU > +/* Return nonzero iff the calling process is in group GID. */ > +extern int group_member (__gid_t __gid) __THROW; > +# endif > + > +#endif /* _BITS_GROUP_MEMBER_H */ > diff --git a/include/unistd.h b/include/unistd.h > index e241603b81..39d5bda372 100644 > --- a/include/unistd.h > +++ b/include/unistd.h > @@ -131,6 +131,7 @@ extern __gid_t __getegid (void) attribute_hidden; > extern int __getgroups (int __size, __gid_t __list[]) attribute_hidden; > libc_hidden_proto (__getpgid) > extern int __group_member (__gid_t __gid) attribute_hidden; > +extern int __group_member2 (__gid_t __gid) attribute_hidden; > extern int __setuid (__uid_t __uid); > extern int __setreuid (__uid_t __ruid, __uid_t __euid); > extern int __setgid (__gid_t __gid); > diff --git a/posix/Makefile b/posix/Makefile > index 3ab124d040..c4948e3980 100644 > --- a/posix/Makefile > +++ b/posix/Makefile > @@ -29,6 +29,7 @@ headers := \ > bits/getopt_core.h \ > bits/getopt_ext.h \ > bits/getopt_posix.h \ > + bits/group_member.h \ > bits/local_lim.h \ > bits/mman_ext.h \ > bits/posix1_lim.h \ > @@ -291,6 +292,7 @@ tests := \ > tst-glob_symlinks \ > tst-gnuglob \ > tst-gnuglob64 \ > + tst-group_member \ > tst-mmap \ > tst-mmap-offset \ > tst-nanosleep \ > @@ -479,6 +481,10 @@ tests-special += \ > # tests-special > endif > > +# This test calls __group_member2 directly, which is not exported from glibc. > +tests-internal += tst-group_member2 > +tests-static += tst-group_member2 > + > include ../Rules > > ifeq ($(run-built-tests),yes) > @@ -606,6 +612,8 @@ bug-glob1-ARGS = "$(objpfx)" > tst-execvp3-ARGS = --test-dir=$(objpfx) > CFLAGS-tst-spawn3.c += -DOBJPFX=\"$(objpfx)\" > > +CFLAGS-tst-group_member.c += -Wno-error=deprecated-declarations > + > # Test voluntarily overflows struct dirent > CFLAGS-bug-glob2.c += $(no-fortify-source) > > diff --git a/posix/group_member.c b/posix/group_member.c > index 22422b1f9f..deb8bb404b 100644 > --- a/posix/group_member.c > +++ b/posix/group_member.c > @@ -18,6 +18,7 @@ > > #include > #include > +#include > #include > #include > > @@ -47,3 +48,37 @@ __group_member (gid_t gid) > return 0; > } > weak_alias (__group_member, group_member) > + > +int > +__group_member2 (gid_t gid) > +{ > + int n; > + gid_t *groups; > + struct scratch_buffer sbuf; > + scratch_buffer_init (&sbuf); > + groups = sbuf.data; > + > + do > + { > + n = __getgroups (0, NULL); > + if (n > sbuf.length) > + { > + if (!scratch_buffer_set_array_size (&sbuf, sizeof (*groups), n)) > + return -1; > + groups = sbuf.data; > + } > + > + n = __getgroups (n, groups); > + } > + while (n > sbuf.length); > + > + while (n-- > 0) > + if (groups[n] == gid) > + { > + scratch_buffer_free (&sbuf); > + return 1; > + } > + > + scratch_buffer_free (&sbuf); > + return 0; > +} > diff --git a/posix/tst-group_member.c b/posix/tst-group_member.c > new file mode 100644 > index 0000000000..7f70841832 > --- /dev/null > +++ b/posix/tst-group_member.c > @@ -0,0 +1,41 @@ > +/* Basic tests for group_member. > + Copyright (C) 2023 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 > + > +static int do_test (void) > +{ > + int n; > + gid_t *groups; > + > + n = getgroups (0, NULL); > + groups = alloca (n * sizeof (*groups)); > + n = getgroups (n, groups); > + > + while (n-- > 0) > + TEST_COMPARE (1, group_member(groups[n])); > + > + return EXIT_SUCCESS; > +} > + > +#include > diff --git a/posix/tst-group_member2.c b/posix/tst-group_member2.c > new file mode 100644 > index 0000000000..ee448c578a > --- /dev/null > +++ b/posix/tst-group_member2.c > @@ -0,0 +1,43 @@ > +/* Basic tests for group_member. > + Copyright (C) 2023 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 > + > +extern int __group_member2 (__gid_t __gid); > + > +static int do_test (void) > +{ > + int n; > + gid_t *groups; > + > + n = getgroups (0, NULL); > + groups = alloca (n * sizeof (*groups)); > + n = getgroups (n, groups); > + > + while (n-- > 0) > + TEST_COMPARE (1, __group_member2(groups[n])); > + > + return EXIT_SUCCESS; > +} > + > +#include > diff --git a/posix/unistd.h b/posix/unistd.h > index 5b91ad4aaa..ccc55bb501 100644 > --- a/posix/unistd.h > +++ b/posix/unistd.h > @@ -710,10 +710,10 @@ extern __gid_t getegid (void) __THROW; > of its supplementary groups in LIST and return the number written. */ > extern int getgroups (int __size, __gid_t __list[]) __THROW __wur > __fortified_attr_access (__write_only__, 2, 1); > + > #ifdef __USE_GNU > -/* Return nonzero iff the calling process is in group GID. */ > -extern int group_member (__gid_t __gid) __THROW; > -#endif > +# include > +#endif > > /* Set the user ID of the calling process to UID. > If the calling process is the super-user, set the real > diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c > index 2282a0a8dd..2eb9db4c95 100644 > --- a/sysdeps/posix/euidaccess.c > +++ b/sysdeps/posix/euidaccess.c > @@ -81,7 +81,7 @@ extern int errno; > > #ifdef _LIBC > > -# define group_member __group_member > +# define group_member __group_member2 > # define euidaccess __euidaccess > > #else > @@ -167,9 +167,14 @@ euidaccess (const char *path, int mode) > || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) > return 0; > > + int gm = group_member (stats.st_gid); > + if (euid != stats.st_uid && egid != stats.st_gid) > + if (gm == -1) > + return -1; > + > if (euid == stats.st_uid) > granted = (unsigned int) (stats.st_mode & (mode << 6)) >> 6; > - else if (egid == stats.st_gid || group_member (stats.st_gid)) > + else if (egid == stats.st_gid || gm) > granted = (unsigned int) (stats.st_mode & (mode << 3)) >> 3; > else > granted = (stats.st_mode & mode); > diff --git a/sysdeps/unix/sysv/linux/bits/group_member.h b/sysdeps/unix/sysv/linux/bits/group_member.h > new file mode 100644 > index 0000000000..0dd9505c76 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/bits/group_member.h > @@ -0,0 +1,32 @@ > +/* group_member declaration > + Copyright (C) 2023 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 > + . */ > + > +#ifndef _UNISTD_H > +# error "Never use directly; include instead." > +#endif > + > +#ifndef _BITS_GROUP_MEMBER_H > +# define _BITS_GROUP_MEMBER_H 1 > + > +# ifdef __USE_GNU > +/* Return nonzero iff the calling process is in group GID. Deprecated */ > +extern int group_member (__gid_t __gid) __THROW > + __attribute_deprecated_msg__ ("may overflow the stack"); > +# endif > + > +#endif /* _BITS_GROUP_MEMBER_H */ > diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c > index 0ccbd778b5..f28ab0a6f4 100644 > --- a/sysdeps/unix/sysv/linux/faccessat.c > +++ b/sysdeps/unix/sysv/linux/faccessat.c > @@ -59,11 +59,17 @@ __faccessat (int fd, const char *file, int mode, int flag) > || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) > return 0; > > + int gm = __group_member2 (stats.st_gid); > + if (uid != stats.st_uid && > + (stats.st_gid != ((flag & AT_EACCESS) ? __getegid () : __getgid ()))) > + if (gm == -1) > + return -1; > + > int granted = (uid == stats.st_uid > ? (unsigned int) (stats.st_mode & (mode << 6)) >> 6 > : (stats.st_gid == ((flag & AT_EACCESS) > ? __getegid () : __getgid ()) > - || __group_member (stats.st_gid)) > + || gm) > ? (unsigned int) (stats.st_mode & (mode << 3)) >> 3 > : (stats.st_mode & mode)); > > -- > 2.41.0 >