aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-06-11 12:12:56 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-06-11 12:12:56 +0200
commit31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1 (patch)
tree205fe71bd6bb121d6425ede7adcc27da05447fe5
parent073f82140c7dbd7af387153c29ac7ac3e882c4ef (diff)
downloadglibc-31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1.zip
glibc-31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1.tar.gz
glibc-31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1.tar.bz2
nss_db: Fix initialization of iteration position [BZ #20237]
When get*ent is called without a preceding set*ent, we need to set the initial iteration position in get*ent. Reproducer: Add “services: db files” to /etc/nsswitch.conf, then run “perl -e getservent”. It will segfault before this change, and exit silently after it.
-rw-r--r--ChangeLog7
-rw-r--r--nss/nss_db/db-XXX.c8
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2989d21..32bef33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-06-11 Florian Weimer <fweimer@redhat.com>
+ [BZ #20237]
+ * nss/nss_db/db-XXX.c (set*ent): Reset entidx to NULL.
+ (get*ent): Set entidx to NULL during initialization. If entidx is
+ NULL, start iteration from the beginning.
+
+2016-06-11 Florian Weimer <fweimer@redhat.com>
+
* malloc/malloc.c (musable): Return correct size for dumped fake
mmapped chunk.
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 125a5e9..2d13edd 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -77,7 +77,7 @@ CONCAT(_nss_db_set,ENTNAME) (int stayopen)
keep_db |= stayopen;
/* Reset the sequential index. */
- entidx = (const char *) state.header + state.header->valstroffset;
+ entidx = NULL;
}
__libc_lock_unlock (lock);
@@ -253,8 +253,14 @@ CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer,
H_ERRNO_SET (NETDB_INTERNAL);
goto out;
}
+ entidx = NULL;
}
+ /* Start from the beginning if freshly initialized or reset
+ requested by set*ent. */
+ if (entidx == NULL)
+ entidx = (const char *) state.header + state.header->valstroffset;
+
status = NSS_STATUS_UNAVAIL;
if (state.header != MAP_FAILED)
{