From d2e929a907914e233d001d1dd5e3143e84fa69e0 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 9 Dec 2020 21:46:30 -0500 Subject: nsswitch: handle missing actions properly Some internal functions need to know if a database has a nonzero list of actions; success getting the database does not guarantee that. Add checks for such as needed. Skip the ":" in each nsswitch.conf line so as not to add a dummy action libnss_:.so See also https://bugzilla.redhat.com/show_bug.cgi?id=1906066 Reviewed-by: Siddhesh Poyarekar --- grp/Makefile | 4 +++ grp/initgroups.c | 6 ++-- grp/tst-initgroups1.c | 56 ++++++++++++++++++++++++++++++ grp/tst-initgroups1.root/etc/group | 7 ++++ grp/tst-initgroups1.root/etc/nsswitch.conf | 1 + grp/tst-initgroups1.root/etc/passwd | 1 + grp/tst-initgroups2.c | 21 +++++++++++ grp/tst-initgroups2.root/etc/group | 7 ++++ grp/tst-initgroups2.root/etc/nsswitch.conf | 2 ++ grp/tst-initgroups2.root/etc/passwd | 1 + 10 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 grp/tst-initgroups1.c create mode 100644 grp/tst-initgroups1.root/etc/group create mode 100644 grp/tst-initgroups1.root/etc/nsswitch.conf create mode 100644 grp/tst-initgroups1.root/etc/passwd create mode 100644 grp/tst-initgroups2.c create mode 100644 grp/tst-initgroups2.root/etc/group create mode 100644 grp/tst-initgroups2.root/etc/nsswitch.conf create mode 100644 grp/tst-initgroups2.root/etc/passwd (limited to 'grp') diff --git a/grp/Makefile b/grp/Makefile index 9d1dae91db..20683f649d 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -31,6 +31,10 @@ routines := fgetgrent initgroups setgroups \ tests := testgrp tst-putgrent +tests-container = \ + tst-initgroups1 \ + tst-initgroups2 + ifeq (yes,$(build-shared)) test-srcs := tst_fgetgrent ifeq ($(run-built-tests),yes) diff --git a/grp/initgroups.c b/grp/initgroups.c index a60ca1c395..22736a17e2 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -72,11 +72,13 @@ internal_getgrouplist (const char *user, gid_t group, long int *size, nss_action_list nip; - if (__nss_database_get (nss_database_initgroups, &nip)) + if (__nss_database_get (nss_database_initgroups, &nip) + && nip != NULL) { use_initgroups_entry = true; } - else if (__nss_database_get (nss_database_group, &nip)) + else if (__nss_database_get (nss_database_group, &nip) + && nip != NULL) { use_initgroups_entry = false; } diff --git a/grp/tst-initgroups1.c b/grp/tst-initgroups1.c new file mode 100644 index 0000000000..f6551cae9b --- /dev/null +++ b/grp/tst-initgroups1.c @@ -0,0 +1,56 @@ +/* Test that initgroups works. + Copyright (C) 2020 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 +#include + +/* Test that initgroups includes secondary groups. + https://bugzilla.redhat.com/show_bug.cgi?id=1906066 */ + +/* This version uses the wrapper around the groups module. */ + +#define EXPECTED_N_GROUPS 4 +static gid_t expected_groups[] = + { 20, 30, 50, 51 }; + +static int +do_test (void) +{ + gid_t mygroups [50]; + int i, n; + + n = 50; + getgrouplist ("dj", 20, mygroups, &n); + + TEST_COMPARE (n, EXPECTED_N_GROUPS); + for (i=0; i diff --git a/grp/tst-initgroups1.root/etc/group b/grp/tst-initgroups1.root/etc/group new file mode 100644 index 0000000000..0dac1cc2ba --- /dev/null +++ b/grp/tst-initgroups1.root/etc/group @@ -0,0 +1,7 @@ +abc:x:10: +def:x:20: +ghi:x:30:dj +jkl:x:40: +m:x:50:not,dj +n:x:51:dj,not +np:x:60:djx diff --git a/grp/tst-initgroups1.root/etc/nsswitch.conf b/grp/tst-initgroups1.root/etc/nsswitch.conf new file mode 100644 index 0000000000..8d0a1aea13 --- /dev/null +++ b/grp/tst-initgroups1.root/etc/nsswitch.conf @@ -0,0 +1 @@ +group : files diff --git a/grp/tst-initgroups1.root/etc/passwd b/grp/tst-initgroups1.root/etc/passwd new file mode 100644 index 0000000000..5e3a2a5eea --- /dev/null +++ b/grp/tst-initgroups1.root/etc/passwd @@ -0,0 +1 @@ +dj:x:84:20:DJ:/:/bin/sh diff --git a/grp/tst-initgroups2.c b/grp/tst-initgroups2.c new file mode 100644 index 0000000000..776e560ec9 --- /dev/null +++ b/grp/tst-initgroups2.c @@ -0,0 +1,21 @@ +/* Test that initgroups works. + Copyright (C) 2020 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 "tst-initgroups1.c" + +/* This version uses the initgroups built in to the files module. */ diff --git a/grp/tst-initgroups2.root/etc/group b/grp/tst-initgroups2.root/etc/group new file mode 100644 index 0000000000..0dac1cc2ba --- /dev/null +++ b/grp/tst-initgroups2.root/etc/group @@ -0,0 +1,7 @@ +abc:x:10: +def:x:20: +ghi:x:30:dj +jkl:x:40: +m:x:50:not,dj +n:x:51:dj,not +np:x:60:djx diff --git a/grp/tst-initgroups2.root/etc/nsswitch.conf b/grp/tst-initgroups2.root/etc/nsswitch.conf new file mode 100644 index 0000000000..c61f3624f6 --- /dev/null +++ b/grp/tst-initgroups2.root/etc/nsswitch.conf @@ -0,0 +1,2 @@ +initgroups : files +group : notfiles diff --git a/grp/tst-initgroups2.root/etc/passwd b/grp/tst-initgroups2.root/etc/passwd new file mode 100644 index 0000000000..5e3a2a5eea --- /dev/null +++ b/grp/tst-initgroups2.root/etc/passwd @@ -0,0 +1 @@ +dj:x:84:20:DJ:/:/bin/sh -- cgit v1.2.3