From: Siddhesh Poyarekar Date: Wed, 12 Mar 2014 11:57:22 +0000 (+0530) Subject: Provide correct buffer length to netgroup queries in nscd (BZ #16695) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e27332819b6151ccb5031d0efd718d802168573;p=thirdparty%2Fglibc.git Provide correct buffer length to netgroup queries in nscd (BZ #16695) The buffer to query netgroup entries is allocated sufficient space for the netgroup entries and the key to be appended at the end, but it sends in an incorrect available length to the NSS netgroup query functions, resulting in overflow of the buffer in some special cases. The fix here is to factor in the key length when sending the available buffer and buffer length to the query functions. (cherry picked from commit c44496df2f090a56d3bf75df930592dac6bba46f) Conflicts: NEWS --- diff --git a/ChangeLog b/ChangeLog index b6185a9861d..d84e14dd851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-03-12 Siddhesh Poyarekar + + [BZ #16695] + * nscd/netgroupcache.c (addgetnetgrentX): Factor in space for + key in the buffer. + 2014-06-20 Maciej W. Rozycki [BZ #16046] diff --git a/NEWS b/NEWS index 3f762d1ffb4..58fe721c752 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,8 @@ Version 2.19.1 * The following bugs are resolved with this release: - 15946, 16545, 16574, 16623, 16882, 16885, 16916, 16932, 16943, 16958, - 17048, 17069. + 15946, 16545, 16574, 16623, 16695, 16882, 16885, 16916, 16932, 16943, + 16958, 17048, 17069. * CVE-2014-4043 The posix_spawn_file_actions_addopen implementation did not copy the path argument. This allowed programs to cause posix_spawn to diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c index be01fe86703..fe7fc750e20 100644 --- a/nscd/netgroupcache.c +++ b/nscd/netgroupcache.c @@ -202,7 +202,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, { int e; status = getfct.f (&data, buffer + buffilled, - buflen - buffilled, &e); + buflen - buffilled - req->key_len, &e); if (status == NSS_STATUS_RETURN || status == NSS_STATUS_NOTFOUND) /* This was either the last one for this group or the