diff options
| author | DJ Delorie <dj@redhat.com> | 2019-06-28 18:30:00 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2019-10-31 17:55:49 -0400 |
| commit | cef4c840a80372fe084effec0da1177d44b40bc0 (patch) | |
| tree | ce31c6a602d8c8d6b0e82d205950612d6844da29 | |
| parent | 0d3905b110000463775b3fb189213833acaebf81 (diff) | |
| download | glibc-cef4c840a80372fe084effec0da1177d44b40bc0.tar.gz glibc-cef4c840a80372fe084effec0da1177d44b40bc0.tar.xz glibc-cef4c840a80372fe084effec0da1177d44b40bc0.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. (cherry picked from commit 99135114ba23c3110b7e4e650fabdc5e639746b7) (note: tests excluded as test-in-container infrastructure missing)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | nss/nss_db/db-open.c | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fcc0f8041d..d932485496 100644 --- 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 8538f8e961..ac430f445a 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; + } } |