lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

Correctly reparse group line after enlarging the buffer

Browse Source
This commit is contained in:
Andreas Schwab
2011-09-26 17:49:14 +02:00
parent bf972c9dfc
commit 32c76b63be
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2011-09-27 Andreas Schwab <schwab@redhat.com>
* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn):
Reread the line before reparsing it.
2011-09-26 Andreas Schwab <schwab@redhat.com> 2011-09-26 Andreas Schwab <schwab@redhat.com>
* sysdeps/x86_64/fpu/bits/mathinline.h: Use __asm instead of asm. * sysdeps/x86_64/fpu/bits/mathinline.h: Use __asm instead of asm.

12
nss/nss_files/files-initgroups.c
View File

@@ -52,8 +52,10 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
gid_t *groups = *groupsp; gid_t *groups = *groupsp;
/* We have to iterate over the entire file. */ /* We have to iterate over the entire file. */
while (!feof_unlocked (stream)) while (1)
{ {
fpos_t pos;
fgetpos (stream, &pos);
ssize_t n = getline (&line, &linelen, stream); ssize_t n = getline (&line, &linelen, stream);
if (n < 0) if (n < 0)
{ {
@@ -64,9 +66,8 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
} }
struct group grp; struct group grp;
int res; int res = _nss_files_parse_grent (line, &grp, buffer, buflen, errnop);
while ((res = _nss_files_parse_grent (line, &grp, buffer, buflen, if (res == -1)
errnop)) == -1)
{ {
size_t newbuflen = 2 * buflen; size_t newbuflen = 2 * buflen;
if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen)) if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
@@ -85,6 +86,9 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
} }
else else
buffer = extend_alloca (buffer, buflen, newbuflen); buffer = extend_alloca (buffer, buflen, newbuflen);
/* Reread current line, the parser has clobbered it. */
fsetpos (stream, &pos);
continue;
} }
if (res > 0 && grp.gr_gid != group) if (res > 0 && grp.gr_gid != group)