nss_db: fix endent wrt NULL mappings [BZ #24695] [BZ #24696]

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.

If the database doesn't exist, however, end*ent erroniously called
munmap which set errno.

The test case runs "makedb" inside the testroot, so needs selinux
DSOs installed.

(cherry picked from commit 99135114ba23c3110b7e4e650fabdc5e639746b7)
(note: tests excluded as test-in-container infrastructure missing)

diff --git a/ChangeLog b/ChangeLog
index fcc0f8041dbafa163942cfbf6e41d8e0e7382dd9..d93248549632aa360057cc5264f1a8b3b499f185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-07-10  DJ Delorie  <dj@redhat.com>
+           Sergei Trofimovich <slyfox@inbox.ru>
+
+       [BZ #24696]
+       [BZ #24695]
+       * nss/nss_db/db-open.c (internal_endent): Protect against NULL
+       mappings.
+
 2019-07-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #24259]

diff --git a/nss/nss_db/db-open.c b/nss/nss_db/db-open.c
index 8538f8e961fa43587179febed76ae721a0ec5412..ac430f445adcf7b1deee8ba3f5060205b2e9e4f8 100644 (file)
--- a/nss/nss_db/db-open.c
+++ b/nss/nss_db/db-open.c
@@ -63,5 +63,9 @@ internal_setent (const char *file, struct nss_db_map *mapping)
 void
 internal_endent (struct nss_db_map *mapping)
 {
-  munmap (mapping->header, mapping->len);
+  if (mapping->header != NULL)
+    {
+      munmap (mapping->header, mapping->len);
+      mapping->header = NULL;
+    }
 }