AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: Fix getpwnam_r usage (BZ #1062)

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella 2017-09-04 17:00:03 -03:00
parent e00f242599
commit 5a79f97554
2 changed files with 31 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[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.
* include/scratch_buffer.h (scratch_buffer): Use a C99 align method * include/scratch_buffer.h (scratch_buffer): Use a C99 align method
instead of GCC extension. instead of GCC extension.
* malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h. * malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h.

160
posix/glob.c
View File

@ -15,10 +15,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _LIBC
# include <config.h>
#endif
#include <glob.h> #include <glob.h>
#include <errno.h> #include <errno.h>
@ -39,10 +35,6 @@
#endif #endif
#include <errno.h> #include <errno.h>
#ifndef __set_errno
# define __set_errno(val) errno = (val)
#endif
#include <dirent.h> #include <dirent.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -82,12 +74,8 @@
#include <flexmember.h> #include <flexmember.h>
#include <glob_internal.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 #ifdef _SC_LOGIN_NAME_MAX
# define GET_LOGIN_NAME_MAX() sysconf (_SC_LOGIN_NAME_MAX) # define GET_LOGIN_NAME_MAX() sysconf (_SC_LOGIN_NAME_MAX)
#else #else
@ -648,97 +636,36 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
if (success) if (success)
{ {
struct passwd *p; struct passwd *p;
char *malloc_pwtmpbuf = NULL; struct scratch_buffer pwtmpbuf;
char *pwtmpbuf; scratch_buffer_init (&pwtmpbuf);
# if defined HAVE_GETPWNAM_R || defined _LIBC # if defined HAVE_GETPWNAM_R || defined _LIBC
long int pwbuflenmax = GETPW_R_SIZE_MAX ();
size_t pwbuflen = pwbuflenmax;
struct passwd pwbuf; struct passwd pwbuf;
int save = errno;
# ifndef _LIBC while (getpwnam_r (name, &pwbuf,
if (! (0 < pwbuflenmax && pwbuflenmax <= SIZE_MAX)) pwtmpbuf.data, pwtmpbuf.length, &p)
/* 'sysconf' does not support _SC_GETPW_R_SIZE_MAX. == ERANGE)
Try a moderate value. */
pwbuflen = 1024;
# endif
if (glob_use_alloca (alloca_used, pwbuflen))
pwtmpbuf = alloca_account (pwbuflen, alloca_used);
else
{ {
pwtmpbuf = malloc (pwbuflen); if (!scratch_buffer_grow (&pwtmpbuf))
if (pwtmpbuf == NULL)
{ {
if (__glibc_unlikely (malloc_name))
free (name);
retval = GLOB_NOSPACE; retval = GLOB_NOSPACE;
goto out; 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 # else
p = getpwnam (name); p = getpwnam (name);
# endif # endif
if (__glibc_unlikely (malloc_name))
free (name);
if (p != NULL) if (p != NULL)
{ {
if (malloc_pwtmpbuf == NULL) home_dir = strdup (p->pw_dir);
home_dir = p->pw_dir; malloc_home_dir = 1;
else
{
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) if (home_dir == NULL)
{ {
free (pwtmpbuf); scratch_buffer_free (&pwtmpbuf);
retval = GLOB_NOSPACE; retval = GLOB_NOSPACE;
goto out; goto out;
} }
malloc_home_dir = 1;
} }
memcpy (home_dir, p->pw_dir, home_dir_len); scratch_buffer_free (&pwtmpbuf);
}
}
free (malloc_pwtmpbuf);
} }
else else
{ {
@ -875,61 +802,21 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
/* Look up specific user's home directory. */ /* Look up specific user's home directory. */
{ {
struct passwd *p; struct passwd *p;
char *malloc_pwtmpbuf = NULL; struct scratch_buffer pwtmpbuf;
# if defined HAVE_GETPWNAM_R || defined _LIBC scratch_buffer_init (&pwtmpbuf);
long int buflenmax = GETPW_R_SIZE_MAX ();
size_t buflen = buflenmax;
char *pwtmpbuf;
struct passwd pwbuf;
int save = errno;
# ifndef _LIBC # if defined HAVE_GETPWNAM_R || defined _LIBC
if (! (0 <= buflenmax && buflenmax <= SIZE_MAX)) struct passwd pwbuf;
/* Perhaps 'sysconf' does not support _SC_GETPW_R_SIZE_MAX. Try a
moderate value. */ while (getpwnam_r (user_name, &pwbuf,
buflen = 1024; pwtmpbuf.data, pwtmpbuf.length, &p)
# endif == ERANGE)
if (glob_use_alloca (alloca_used, buflen))
pwtmpbuf = alloca_account (buflen, alloca_used);
else
{ {
pwtmpbuf = malloc (buflen); if (!scratch_buffer_grow (&pwtmpbuf))
if (pwtmpbuf == NULL)
{ {
nomem_getpw:
if (__glibc_unlikely (malloc_user_name))
free (user_name);
retval = GLOB_NOSPACE; retval = GLOB_NOSPACE;
goto out; 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 # else
p = getpwnam (user_name); p = getpwnam (user_name);
@ -956,7 +843,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
dirname = malloc (home_len + rest_len + 1); dirname = malloc (home_len + rest_len + 1);
if (dirname == NULL) if (dirname == NULL)
{ {
free (malloc_pwtmpbuf); scratch_buffer_free (&pwtmpbuf);
retval = GLOB_NOSPACE; retval = GLOB_NOSPACE;
goto out; goto out;
} }
@ -967,13 +854,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
dirlen = home_len + rest_len; dirlen = home_len + rest_len;
dirname_modified = 1; dirname_modified = 1;
free (malloc_pwtmpbuf);
} }
else else
{ {
free (malloc_pwtmpbuf);
if (flags & GLOB_TILDE_CHECK) if (flags & GLOB_TILDE_CHECK)
{ {
/* We have to regard it as an error if we cannot find the /* We have to regard it as an error if we cannot find the
@ -982,6 +865,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
goto out; goto out;
} }
} }
scratch_buffer_free (&pwtmpbuf);
} }
#endif /* !WINDOWS32 */ #endif /* !WINDOWS32 */
} }