diff mbox series

[10/11] shadow: Implement fgetspent_r using __nss_fgetent_r

Message ID 418bb5d8b04310cdb91a966af870031188dd36dd.1594974444.git.fweimer@redhat.com
State Committed
Headers show
Series Fix fgetsgent_r data corruption bug (20338) | expand

Commit Message

Florian Weimer July 17, 2020, 8:30 a.m. UTC
---
 gshadow/tst-fgetsgent_r.c |  1 +
 shadow/fgetspent_r.c      | 43 ++++++---------------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

Comments

Carlos O'Donell July 21, 2020, 3:28 a.m. UTC | #1
On 7/17/20 4:30 AM, Florian Weimer via Libc-alpha wrote:

OK for 2.32.

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  gshadow/tst-fgetsgent_r.c |  1 +
>  shadow/fgetspent_r.c      | 43 ++++++---------------------------------
>  2 files changed, 7 insertions(+), 37 deletions(-)
> 
> diff --git a/gshadow/tst-fgetsgent_r.c b/gshadow/tst-fgetsgent_r.c
> index 780409afa9..f81e09b362 100644
> --- a/gshadow/tst-fgetsgent_r.c
> +++ b/gshadow/tst-fgetsgent_r.c
> @@ -168,6 +168,7 @@ run_test (const char *path, size_t buffer_size)
>        free (result_storage);
>      }
>  
> +  xfclose (fp);
>    return resized;
>  }
>  
> diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c
> index da35846df0..d4d4e52f6a 100644
> --- a/shadow/fgetspent_r.c
> +++ b/shadow/fgetspent_r.c
> @@ -20,9 +20,6 @@
>  #include <shadow.h>
>  #include <stdio.h>
>  
> -#define flockfile(s) _IO_flockfile (s)
> -#define funlockfile(s) _IO_funlockfile (s)
> -
>  /* Define a line parsing function using the common code
>     used in the nss_files module.  */
>  
> @@ -39,39 +36,11 @@ int
>  __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen,
>  	       struct spwd **result)
>  {
> -  char *p;
> -
> -  flockfile (stream);
> -  do
> -    {
> -      buffer[buflen - 1] = '\xff';
> -      p = fgets_unlocked (buffer, buflen, stream);
> -      if (p == NULL && feof_unlocked (stream))
> -	{
> -	  funlockfile (stream);
> -	  *result = NULL;
> -	  __set_errno (ENOENT);
> -	  return errno;
> -	}
> -      if (p == NULL || buffer[buflen - 1] != '\xff')
> -	{
> -	  funlockfile (stream);
> -	  *result = NULL;
> -	  __set_errno (ERANGE);
> -	  return errno;
> -	}
> -
> -      /* Skip leading blanks.  */
> -      while (isspace (*p))
> -	++p;
> -    } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines.  */
> -	     /* Parse the line.  If it is invalid, loop to
> -		get the next line of the file to parse.  */
> -	     || ! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
> -
> -  funlockfile (stream);
> -
> -  *result = resbuf;
> -  return 0;
> +  int ret = __nss_fgetent_r (stream, resbuf, buffer, buflen, parse_line);
> +  if (ret == 0)
> +    *result = resbuf;
> +  else
> +    *result = NULL;
> +  return ret;
>  }
>  weak_alias (__fgetspent_r, fgetspent_r)
>
diff mbox series

Patch

diff --git a/gshadow/tst-fgetsgent_r.c b/gshadow/tst-fgetsgent_r.c
index 780409afa9..f81e09b362 100644
--- a/gshadow/tst-fgetsgent_r.c
+++ b/gshadow/tst-fgetsgent_r.c
@@ -168,6 +168,7 @@  run_test (const char *path, size_t buffer_size)
       free (result_storage);
     }
 
+  xfclose (fp);
   return resized;
 }
 
diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c
index da35846df0..d4d4e52f6a 100644
--- a/shadow/fgetspent_r.c
+++ b/shadow/fgetspent_r.c
@@ -20,9 +20,6 @@ 
 #include <shadow.h>
 #include <stdio.h>
 
-#define flockfile(s) _IO_flockfile (s)
-#define funlockfile(s) _IO_funlockfile (s)
-
 /* Define a line parsing function using the common code
    used in the nss_files module.  */
 
@@ -39,39 +36,11 @@  int
 __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen,
 	       struct spwd **result)
 {
-  char *p;
-
-  flockfile (stream);
-  do
-    {
-      buffer[buflen - 1] = '\xff';
-      p = fgets_unlocked (buffer, buflen, stream);
-      if (p == NULL && feof_unlocked (stream))
-	{
-	  funlockfile (stream);
-	  *result = NULL;
-	  __set_errno (ENOENT);
-	  return errno;
-	}
-      if (p == NULL || buffer[buflen - 1] != '\xff')
-	{
-	  funlockfile (stream);
-	  *result = NULL;
-	  __set_errno (ERANGE);
-	  return errno;
-	}
-
-      /* Skip leading blanks.  */
-      while (isspace (*p))
-	++p;
-    } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines.  */
-	     /* Parse the line.  If it is invalid, loop to
-		get the next line of the file to parse.  */
-	     || ! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
-
-  funlockfile (stream);
-
-  *result = resbuf;
-  return 0;
+  int ret = __nss_fgetent_r (stream, resbuf, buffer, buflen, parse_line);
+  if (ret == 0)
+    *result = resbuf;
+  else
+    *result = NULL;
+  return ret;
 }
 weak_alias (__fgetspent_r, fgetspent_r)