elf: Refuse to dlopen PIE objects [BZ #24323]

[thirdparty/glibc.git] / shadow / fgetspent_r.c

diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c
index cb14a230373e9df7eb2eb93fa5ce593272f2fbf7..e217647cb3482b906d44b5772e8cdbd4160dde81 100644 (file)
--- a/shadow/fgetspent_r.c
+++ b/shadow/fgetspent_r.c
@@ -1,26 +1,28 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <ctype.h>
 #include <errno.h>
 #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,28 +41,35 @@ __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen,
 {
   char *p;
 
+  flockfile (stream);
   do
     {
-      buffer[buflen] = '\xff';
-      p = fgets (buffer, buflen, stream);
-      if (p == NULL && feof (stream))
+      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] != '\xff')
+      if (p == NULL || buffer[buflen - 1] != '\xff')
        {
+         funlockfile (stream);
          *result = NULL;
-         return errno = ERANGE;
+         __set_errno (ERANGE);
+         return errno;
        }
 
       /* Skip leading blanks.  */
       while (isspace (*p))
        ++p;
-    } while (*p == '\0' || *p == '#' ||        /* Ignore empty and comment lines.  */
+    } 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));
+            || ! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
+
+  funlockfile (stream);
 
   *result = resbuf;
   return 0;