nss_db: reset mapping after last get*ent
Commit Message
Florian Weimer <fw@deneb.enyo.de> writes:
> This needs a bug in Bugzilla and, ideally, a test case.
How's this?
https://sourceware.org/bugzilla/show_bug.cgi?id=24695
nss_db allows for getpwent et al to be called without a set*ent,
but it only works once. After the last get*ent a set*ent is
required to restart, because the end*ent did not properly reset
the module. Resetting it to NULL allows for a proper restart.
The test case runs "makedb" inside the testroot, so needs selinux
DSOs installed.
* nss/nss_db/db-open.c (internal_endent): Reset mapping to NULL.
* nss/tst-nss-db-endpwent.c: New.
* nss/tst-nss-db-endpwent.root: New.
* nss/Makefile: Add new test.
* support/links-dso-program-c.c: Add selinux dependency.
* support/links-dso-program.cc: Add selinux dependency.
* support/Makefile: Build those with -lselinux if enabled.
Comments
On Jun 17 2019, DJ Delorie <dj@redhat.com> wrote:
> diff --git a/support/links-dso-program-c.c b/support/links-dso-program-c.c
> index d28a28a0d0..6043b8652b 100644
> --- a/support/links-dso-program-c.c
> +++ b/support/links-dso-program-c.c
> @@ -1,9 +1,18 @@
> #include <stdio.h>
>
> +/* makedb needs selinux dso's. */
> +#ifdef HAVE_SELINUX
> +# include <selinux/selinux.h>
> +int sel;
Where is this variable used?
Andreas.
@@ -61,7 +61,8 @@ xtests = bug-erange
tests-container = \
tst-nss-test3 \
- tst-nss-files-hosts-long
+ tst-nss-files-hosts-long \
+ tst-nss-db-endpwent
# Tests which need libdl
ifeq (yes,$(build-shared))
@@ -64,4 +64,5 @@ void
internal_endent (struct nss_db_map *mapping)
{
munmap (mapping->header, mapping->len);
+ mapping->header = NULL;
}
new file mode 100644
@@ -0,0 +1,47 @@
+/* Test for endpwent->getpwent crash.
+ Copyright (C) 2019 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <pwd.h>
+
+#include <support/check.h>
+
+static void
+try_it (void)
+{
+ struct passwd *pw;
+
+ /* setpwent() is intentionally omitted here. */
+
+ while ((pw = getpwent ()) != NULL)
+ ;
+
+ endpwent ();
+}
+
+static int
+do_test (void)
+{
+ system ("/usr/bin/makedb -o /var/db/passwd.db /var/db/passwd.in");
+ try_it ();
+ try_it ();
+
+ return 0;
+}
+#include <support/test-driver.c>
new file mode 100644
@@ -0,0 +1 @@
+passwd: db
new file mode 100644
@@ -0,0 +1,4 @@
+.root root:x:0:0:root:/root:/bin/bash
+=0 root:x:0:0:root:/root:/bin/bash
+.bin bin:x:1:1:bin:/bin:/sbin/nologin
+=1 bin:x:1:1:bin:/bin:/sbin/nologin
@@ -191,6 +191,11 @@ LINKS_DSO_PROGRAM = links-dso-program
LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
endif
+ifeq (yes,$(have-selinux))
+LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux
+endif
+
+
LDLIBS-test-container = $(libsupport)
others += test-container
@@ -1,9 +1,18 @@
#include <stdio.h>
+/* makedb needs selinux dso's. */
+#ifdef HAVE_SELINUX
+# include <selinux/selinux.h>
+int sel;
+#endif
+
int
main (int argc, char **argv)
{
/* Complexity to keep gcc from optimizing this away. */
printf ("This is a test %s.\n", argc > 1 ? argv[1] : "null");
+#ifdef HAVE_SELINUX
+ sel = is_selinux_enabled ();
+#endif
return 0;
}
@@ -1,5 +1,11 @@
#include <iostream>
+/* makedb needs selinux dso's. */
+#ifdef HAVE_SELINUX
+# include <selinux/selinux.h>
+int sel;
+#endif
+
using namespace std;
int
@@ -7,5 +13,8 @@ main (int argc, char **argv)
{
/* Complexity to keep gcc from optimizing this away. */
cout << (argc > 1 ? argv[1] : "null");
+#ifdef HAVE_SELINUX
+ sel = is_selinux_enabled ();
+#endif
return 0;
}