about summary refs log tree commit diff
path: root/nss/nss_db/db-open.c
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2019-06-28 18:30:00 -0500
committerDJ Delorie <dj@redhat.com>2019-07-10 14:51:18 -0400
commit99135114ba23c3110b7e4e650fabdc5e639746b7 (patch)
tree09e4349308db59321eddff440eadaa630f60575b /nss/nss_db/db-open.c
parent30ba0375464f34e4bf8129f3d3dc14d0c09add17 (diff)
downloadglibc-99135114ba23c3110b7e4e650fabdc5e639746b7.tar.gz
glibc-99135114ba23c3110b7e4e650fabdc5e639746b7.tar.xz
glibc-99135114ba23c3110b7e4e650fabdc5e639746b7.zip
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.
Diffstat (limited to 'nss/nss_db/db-open.c')
-rw-r--r--nss/nss_db/db-open.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nss/nss_db/db-open.c b/nss/nss_db/db-open.c
index 8a83d6b930..3fa11e9ab0 100644
--- 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;
+    }
 }