This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.22/master updated. glibc-2.22-87-g809cde4
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Aug 2016 13:24:11 -0000
- Subject: GNU C Library master sources branch release/2.22/master updated. glibc-2.22-87-g809cde4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.22/master has been updated
via 809cde4a640032f2f87319c9358be4fee8d6d7d5 (commit)
from a8c871a8714b968b1a1e3e679919a2125fc968f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=809cde4a640032f2f87319c9358be4fee8d6d7d5
commit 809cde4a640032f2f87319c9358be4fee8d6d7d5
Author: Florian Weimer <fweimer@redhat.com>
Date: Sat Jun 11 12:12:56 2016 +0200
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.
(cherry picked from commit 31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1)
diff --git a/ChangeLog b/ChangeLog
index 3541385..bb8d618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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-30 Andreas Schwab <schwab@suse.de>
[BZ #20262]
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 4a0766a..70b58be 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)
{
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
nss/nss_db/db-XXX.c | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources