ab210104fb
Upstream commit: edcf13e25c1559558a6f12ff5a71d4136a39235e - PTHREAD_STACK_MIN is too small on x86-64 (#1527887) - CVE-2018-1000001: Make getcwd fail if it cannot obtain an absolute path (#1533837) - CVE-2017-16997: Check for empty tokens before dynamic string token expansion in the dynamic linker (#1526866) - CVE-2017-15804: glob: Fix overflow in GLOB_TILDE unescaping (swbz#22332) - CVE-2017-15670: glob: Fix one-byte overflow (#1504807) - CVE-2017-15671: glob: Fix memory leak (#1504807) - nss_files: Avoid large buffers with many host addresses (swbz#22078) - nss_files: Use struct scratch_buffer for gethostbyname (swbz#18023) - posix: Fix improper assert in Linux posix_spawn (BZ#22273) - Don't use IFUNC resolver for longjmp or system in libpthread (swbz#21041) - x86-64: Use fxsave/xsave/xsavec in _dl_runtime_resolve (swbz#21265)
272 lines
7.2 KiB
Diff
272 lines
7.2 KiB
Diff
commit 5a79f97554af6f2eb0a654f844b3d1f56937064d
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Mon Sep 4 17:00:03 2017 -0300
|
|
|
|
posix: Fix getpwnam_r usage (BZ #1062)
|
|
|
|
This patch fixes longstanding misuse of errno after getpwnam_r,
|
|
which returns an error number rather than setting errno. This is
|
|
sync with gnulib commit 5db9301.
|
|
|
|
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
|
|
for all major architectures.
|
|
|
|
[BZ #1062]
|
|
* posix/glob.c (glob): Port recent patches to platforms
|
|
lacking getpwnam_r.
|
|
(glob): Fix longstanding misuse of errno after getpwnam_r, which
|
|
returns an error number rather than setting errno.
|
|
|
|
diff --git a/posix/glob.c b/posix/glob.c
|
|
index c761c0861ddb49ea..70434745f57f8ff5 100644
|
|
--- a/posix/glob.c
|
|
+++ b/posix/glob.c
|
|
@@ -15,10 +15,6 @@
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
-#ifndef _LIBC
|
|
-# include <config.h>
|
|
-#endif
|
|
-
|
|
#include <glob.h>
|
|
|
|
#include <errno.h>
|
|
@@ -39,10 +35,6 @@
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
-#ifndef __set_errno
|
|
-# define __set_errno(val) errno = (val)
|
|
-#endif
|
|
-
|
|
#include <dirent.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
@@ -78,12 +70,8 @@
|
|
|
|
#include <flexmember.h>
|
|
#include <glob_internal.h>
|
|
+#include <scratch_buffer.h>
|
|
|
|
-#ifdef _SC_GETPW_R_SIZE_MAX
|
|
-# define GETPW_R_SIZE_MAX() sysconf (_SC_GETPW_R_SIZE_MAX)
|
|
-#else
|
|
-# define GETPW_R_SIZE_MAX() (-1)
|
|
-#endif
|
|
#ifdef _SC_LOGIN_NAME_MAX
|
|
# define GET_LOGIN_NAME_MAX() sysconf (_SC_LOGIN_NAME_MAX)
|
|
#else
|
|
@@ -651,97 +639,36 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
|
|
if (success)
|
|
{
|
|
struct passwd *p;
|
|
- char *malloc_pwtmpbuf = NULL;
|
|
- char *pwtmpbuf;
|
|
+ struct scratch_buffer pwtmpbuf;
|
|
+ scratch_buffer_init (&pwtmpbuf);
|
|
# if defined HAVE_GETPWNAM_R || defined _LIBC
|
|
- long int pwbuflenmax = GETPW_R_SIZE_MAX ();
|
|
- size_t pwbuflen = pwbuflenmax;
|
|
struct passwd pwbuf;
|
|
- int save = errno;
|
|
|
|
-# ifndef _LIBC
|
|
- if (! (0 < pwbuflenmax && pwbuflenmax <= SIZE_MAX))
|
|
- /* 'sysconf' does not support _SC_GETPW_R_SIZE_MAX.
|
|
- Try a moderate value. */
|
|
- pwbuflen = 1024;
|
|
-# endif
|
|
- if (glob_use_alloca (alloca_used, pwbuflen))
|
|
- pwtmpbuf = alloca_account (pwbuflen, alloca_used);
|
|
- else
|
|
+ while (getpwnam_r (name, &pwbuf,
|
|
+ pwtmpbuf.data, pwtmpbuf.length, &p)
|
|
+ == ERANGE)
|
|
{
|
|
- pwtmpbuf = malloc (pwbuflen);
|
|
- if (pwtmpbuf == NULL)
|
|
+ if (!scratch_buffer_grow (&pwtmpbuf))
|
|
{
|
|
- if (__glibc_unlikely (malloc_name))
|
|
- free (name);
|
|
retval = GLOB_NOSPACE;
|
|
goto out;
|
|
}
|
|
- malloc_pwtmpbuf = pwtmpbuf;
|
|
- }
|
|
-
|
|
- while (getpwnam_r (name, &pwbuf, pwtmpbuf, pwbuflen, &p)
|
|
- != 0)
|
|
- {
|
|
- size_t newlen;
|
|
- bool v;
|
|
- if (errno != ERANGE)
|
|
- {
|
|
- p = NULL;
|
|
- break;
|
|
- }
|
|
- v = size_add_wrapv (pwbuflen, pwbuflen, &newlen);
|
|
- if (!v && malloc_pwtmpbuf == NULL
|
|
- && glob_use_alloca (alloca_used, newlen))
|
|
- pwtmpbuf = extend_alloca_account (pwtmpbuf, pwbuflen,
|
|
- newlen, alloca_used);
|
|
- else
|
|
- {
|
|
- char *newp = (v ? NULL
|
|
- : realloc (malloc_pwtmpbuf, newlen));
|
|
- if (newp == NULL)
|
|
- {
|
|
- free (malloc_pwtmpbuf);
|
|
- if (__glibc_unlikely (malloc_name))
|
|
- free (name);
|
|
- retval = GLOB_NOSPACE;
|
|
- goto out;
|
|
- }
|
|
- malloc_pwtmpbuf = pwtmpbuf = newp;
|
|
- }
|
|
- pwbuflen = newlen;
|
|
- __set_errno (save);
|
|
}
|
|
# else
|
|
p = getpwnam (name);
|
|
# endif
|
|
- if (__glibc_unlikely (malloc_name))
|
|
- free (name);
|
|
if (p != NULL)
|
|
{
|
|
- if (malloc_pwtmpbuf == NULL)
|
|
- home_dir = p->pw_dir;
|
|
- else
|
|
+ home_dir = strdup (p->pw_dir);
|
|
+ malloc_home_dir = 1;
|
|
+ if (home_dir == NULL)
|
|
{
|
|
- size_t home_dir_len = strlen (p->pw_dir) + 1;
|
|
- if (glob_use_alloca (alloca_used, home_dir_len))
|
|
- home_dir = alloca_account (home_dir_len,
|
|
- alloca_used);
|
|
- else
|
|
- {
|
|
- home_dir = malloc (home_dir_len);
|
|
- if (home_dir == NULL)
|
|
- {
|
|
- free (pwtmpbuf);
|
|
- retval = GLOB_NOSPACE;
|
|
- goto out;
|
|
- }
|
|
- malloc_home_dir = 1;
|
|
- }
|
|
- memcpy (home_dir, p->pw_dir, home_dir_len);
|
|
+ scratch_buffer_free (&pwtmpbuf);
|
|
+ retval = GLOB_NOSPACE;
|
|
+ goto out;
|
|
}
|
|
}
|
|
- free (malloc_pwtmpbuf);
|
|
+ scratch_buffer_free (&pwtmpbuf);
|
|
}
|
|
else
|
|
{
|
|
@@ -878,61 +805,21 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
|
|
/* Look up specific user's home directory. */
|
|
{
|
|
struct passwd *p;
|
|
- char *malloc_pwtmpbuf = NULL;
|
|
+ struct scratch_buffer pwtmpbuf;
|
|
+ scratch_buffer_init (&pwtmpbuf);
|
|
+
|
|
# if defined HAVE_GETPWNAM_R || defined _LIBC
|
|
- long int buflenmax = GETPW_R_SIZE_MAX ();
|
|
- size_t buflen = buflenmax;
|
|
- char *pwtmpbuf;
|
|
struct passwd pwbuf;
|
|
- int save = errno;
|
|
-
|
|
-# ifndef _LIBC
|
|
- if (! (0 <= buflenmax && buflenmax <= SIZE_MAX))
|
|
- /* Perhaps 'sysconf' does not support _SC_GETPW_R_SIZE_MAX. Try a
|
|
- moderate value. */
|
|
- buflen = 1024;
|
|
-# endif
|
|
- if (glob_use_alloca (alloca_used, buflen))
|
|
- pwtmpbuf = alloca_account (buflen, alloca_used);
|
|
- else
|
|
+
|
|
+ while (getpwnam_r (user_name, &pwbuf,
|
|
+ pwtmpbuf.data, pwtmpbuf.length, &p)
|
|
+ == ERANGE)
|
|
{
|
|
- pwtmpbuf = malloc (buflen);
|
|
- if (pwtmpbuf == NULL)
|
|
+ if (!scratch_buffer_grow (&pwtmpbuf))
|
|
{
|
|
- nomem_getpw:
|
|
- if (__glibc_unlikely (malloc_user_name))
|
|
- free (user_name);
|
|
retval = GLOB_NOSPACE;
|
|
goto out;
|
|
}
|
|
- malloc_pwtmpbuf = pwtmpbuf;
|
|
- }
|
|
-
|
|
- while (getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) != 0)
|
|
- {
|
|
- size_t newlen;
|
|
- bool v;
|
|
- if (errno != ERANGE)
|
|
- {
|
|
- p = NULL;
|
|
- break;
|
|
- }
|
|
- v = size_add_wrapv (buflen, buflen, &newlen);
|
|
- if (!v && malloc_pwtmpbuf == NULL
|
|
- && glob_use_alloca (alloca_used, newlen))
|
|
- pwtmpbuf = extend_alloca_account (pwtmpbuf, buflen,
|
|
- newlen, alloca_used);
|
|
- else
|
|
- {
|
|
- char *newp = v ? NULL : realloc (malloc_pwtmpbuf, newlen);
|
|
- if (newp == NULL)
|
|
- {
|
|
- free (malloc_pwtmpbuf);
|
|
- goto nomem_getpw;
|
|
- }
|
|
- malloc_pwtmpbuf = pwtmpbuf = newp;
|
|
- }
|
|
- __set_errno (save);
|
|
}
|
|
# else
|
|
p = getpwnam (user_name);
|
|
@@ -959,7 +846,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
|
|
dirname = malloc (home_len + rest_len + 1);
|
|
if (dirname == NULL)
|
|
{
|
|
- free (malloc_pwtmpbuf);
|
|
+ scratch_buffer_free (&pwtmpbuf);
|
|
retval = GLOB_NOSPACE;
|
|
goto out;
|
|
}
|
|
@@ -970,13 +857,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
|
|
|
|
dirlen = home_len + rest_len;
|
|
dirname_modified = 1;
|
|
-
|
|
- free (malloc_pwtmpbuf);
|
|
}
|
|
else
|
|
{
|
|
- free (malloc_pwtmpbuf);
|
|
-
|
|
if (flags & GLOB_TILDE_CHECK)
|
|
{
|
|
/* We have to regard it as an error if we cannot find the
|
|
@@ -985,6 +868,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
|
|
goto out;
|
|
}
|
|
}
|
|
+ scratch_buffer_free (&pwtmpbuf);
|
|
}
|
|
#endif /* !WINDOWS32 */
|
|
}
|