Enlarge buffer sizes beyond _SC_GET{PW,GR}_R_SIZE_MAX if necessary.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/nonlocal-group.c b/nonlocal-group.c
index f2fdae9386ef33306f08fab4965a68526703271d..085fafdb35a373255a002e9094d7ecb510fe2b67 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -97,12 +97,22 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getgrgid_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (gid, &gbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           buflen *= 2;
+           buf = malloc(buflen);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS) {
@@ -149,12 +159,22 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getgrnam_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (name, &gbuf, buf, len, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           len *= 2;
+           buf = malloc(len);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status != NSS_STATUS_SUCCESS)

diff --git a/nonlocal-passwd.c b/nonlocal-passwd.c
index 80708dc1f8d62ba4d6d270dc2cf2b5c48b3476c1..a5570df6040f7217b69ea4a849f97bbe1ca08b4a 100644 (file)
--- a/nonlocal-passwd.c
+++ b/nonlocal-passwd.c
@@ -95,12 +95,22 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getpwuid_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (uid, &pwbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           buflen *= 2;
+           buf = malloc(buflen);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS) {
@@ -146,12 +156,22 @@ check_nonlocal_user(const char *user, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getpwnam_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (user, &pwbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           buflen *= 2;
+           buf = malloc(buflen);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS)