From d41242129ba693cdbc8db85b846fcaccf9f0b7c4 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 2 Jan 2014 10:03:12 +0530 Subject: [PATCH] Fix infinite loop in nscd when netgroup is empty (bz #16365) Currently, when a user looks up a netgroup that does not have any members, nscd goes into an infinite loop trying to find members in the group. This is because it does not handle cases when getnetgrent returns an NSS_STATUS_NOTFOUND (which is what it does on empty group). Fixed to handle this in the same way as NSS_STATUS_RETURN, similar to what getgrent does by itself. --- ChangeLog | 6 ++++++ NEWS | 2 +- nscd/netgroupcache.c | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f40157..dd7bd66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-01-02 Siddhesh Poyarekar + + [BZ # 16365] + * nscd/netgroupcache.c (addgetnetgrentX): Break if status is + NSS_STATUS_NOTFOUND. + 2014-01-01 Joseph Myers * sysdeps/i386/fpu/libm-test-ulps: Regenerated. diff --git a/NEWS b/NEWS index 94bcd3a..869d3b9 100644 --- a/NEWS +++ b/NEWS @@ -23,7 +23,7 @@ Version 2.19 16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078, 16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172, 16195, 16214, 16245, 16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337, - 16338, 16356, 16369, 16372, 16375, 16379. + 16338, 16356, 16365, 16369, 16372, 16375, 16379. * Slovenian translations for glibc messages have been contributed by the Translation Project's Slovenian team of translators. diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c index baebdd7..50936ee 100644 --- a/nscd/netgroupcache.c +++ b/nscd/netgroupcache.c @@ -180,9 +180,10 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, int e; status = getfct.f (&data, buffer + buffilled, buflen - buffilled, &e); - if (status == NSS_STATUS_RETURN) - /* This was the last one for this group. Look - at next group if available. */ + if (status == NSS_STATUS_RETURN + || status == NSS_STATUS_NOTFOUND) + /* This was either the last one for this group or the + group was empty. Look at next group if available. */ break; if (status == NSS_STATUS_SUCCESS) { -- 2.7.4