lib/glibc
lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-05-28 16:21:30 +03:00
Code

Fix confstr use of local buffer outside its extent.

Browse Source
This commit is contained in:
Roland McGrath 2012-03-25 11:36:35 -07:00
parent 6a9b9c02fa
commit ac4c54f0cc
2 changed files with 108 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-25 Roland McGrath <roland@hack.frob.com>
* posix/confstr.c (confstr): Lift RESTENVS definition to function scope.
Reported by Allan McRae <allan@archlinux.org>.
2012-03-23 Jeff Law <law@redhat.com> 2012-03-23 Jeff Law <law@redhat.com>
* nss/getnssent.c (__nss_getent): Fix typo. * nss/getnssent.c (__nss_getent): Fix typo.

216
posix/confstr.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1991,1996,1997,2000-2004,2009,2010 Free /* Copyright (C) 1991-2012 Free Software Foundation, Inc.
Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -34,6 +33,9 @@ confstr (name, buf, len)
{ {
const char *string = ""; const char *string = "";
size_t string_len = 1; size_t string_len = 1;
char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
switch (name) switch (name)
{ {
@ -53,59 +55,55 @@ confstr (name, buf, len)
wint_t types are no greater than the width of type long. wint_t types are no greater than the width of type long.
Currently this means all environment which the system allows. */ Currently this means all environment which the system allows. */
{ string_len = 0;
char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
string_len = 0;
#ifndef _POSIX_V7_ILP32_OFF32 #ifndef _POSIX_V7_ILP32_OFF32
if (__sysconf (_SC_V7_ILP32_OFF32) > 0) if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
#endif #endif
#if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0 #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
{ {
memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
sizeof "POSIX_V7_ILP32_OFF32" - 1); sizeof "POSIX_V7_ILP32_OFF32" - 1);
string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
} }
#endif #endif
#ifndef _POSIX_V7_ILP32_OFFBIG #ifndef _POSIX_V7_ILP32_OFFBIG
if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
#endif #endif
#if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0 #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
sizeof "POSIX_V7_ILP32_OFFBIG" - 1); sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
} }
#endif #endif
#ifndef _POSIX_V7_LP64_OFF64 #ifndef _POSIX_V7_LP64_OFF64
if (__sysconf (_SC_V7_LP64_OFF64) > 0) if (__sysconf (_SC_V7_LP64_OFF64) > 0)
#endif #endif
#if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0 #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
sizeof "POSIX_V7_LP64_OFF64" - 1); sizeof "POSIX_V7_LP64_OFF64" - 1);
string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
} }
#endif #endif
#ifndef _POSIX_V7_LPBIG_OFFBIG #ifndef _POSIX_V7_LPBIG_OFFBIG
if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
#endif #endif
#if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0 #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
} }
#endif #endif
restenvs[string_len++] = '\0'; restenvs[string_len++] = '\0';
string = restenvs; string = restenvs;
}
break; break;
case _CS_V6_WIDTH_RESTRICTED_ENVS: case _CS_V6_WIDTH_RESTRICTED_ENVS:
@ -116,59 +114,55 @@ confstr (name, buf, len)
wint_t types are no greater than the width of type long. wint_t types are no greater than the width of type long.
Currently this means all environment which the system allows. */ Currently this means all environment which the system allows. */
{ string_len = 0;
char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
string_len = 0;
#ifndef _POSIX_V6_ILP32_OFF32 #ifndef _POSIX_V6_ILP32_OFF32
if (__sysconf (_SC_V6_ILP32_OFF32) > 0) if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
#endif #endif
#if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
{ {
memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
sizeof "POSIX_V6_ILP32_OFF32" - 1); sizeof "POSIX_V6_ILP32_OFF32" - 1);
string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
} }
#endif #endif
#ifndef _POSIX_V6_ILP32_OFFBIG #ifndef _POSIX_V6_ILP32_OFFBIG
if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
#endif #endif
#if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0 #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
sizeof "POSIX_V6_ILP32_OFFBIG" - 1); sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
} }
#endif #endif
#ifndef _POSIX_V6_LP64_OFF64 #ifndef _POSIX_V6_LP64_OFF64
if (__sysconf (_SC_V6_LP64_OFF64) > 0) if (__sysconf (_SC_V6_LP64_OFF64) > 0)
#endif #endif
#if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0 #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
sizeof "POSIX_V6_LP64_OFF64" - 1); sizeof "POSIX_V6_LP64_OFF64" - 1);
string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
} }
#endif #endif
#ifndef _POSIX_V6_LPBIG_OFFBIG #ifndef _POSIX_V6_LPBIG_OFFBIG
if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
#endif #endif
#if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0 #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
} }
#endif #endif
restenvs[string_len++] = '\0'; restenvs[string_len++] = '\0';
string = restenvs; string = restenvs;
}
break; break;
case _CS_V5_WIDTH_RESTRICTED_ENVS: case _CS_V5_WIDTH_RESTRICTED_ENVS:
@ -179,59 +173,55 @@ confstr (name, buf, len)
wint_t types are no greater than the width of type long. wint_t types are no greater than the width of type long.
Currently this means all environment which the system allows. */ Currently this means all environment which the system allows. */
{ string_len = 0;
char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
string_len = 0;
#ifndef _XBS5_ILP32_OFF32 #ifndef _XBS5_ILP32_OFF32
if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
#endif #endif
#if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0 #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
{ {
memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
sizeof "XBS5_ILP32_OFF32" - 1); sizeof "XBS5_ILP32_OFF32" - 1);
string_len += sizeof "XBS5_ILP32_OFF32" - 1; string_len += sizeof "XBS5_ILP32_OFF32" - 1;
} }
#endif #endif
#ifndef _XBS5_ILP32_OFFBIG #ifndef _XBS5_ILP32_OFFBIG
if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
#endif #endif
#if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0 #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
sizeof "XBS5_ILP32_OFFBIG" - 1); sizeof "XBS5_ILP32_OFFBIG" - 1);
string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
} }
#endif #endif
#ifndef _XBS5_LP64_OFF64 #ifndef _XBS5_LP64_OFF64
if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
#endif #endif
#if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0 #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "XBS5_LP64_OFF64", memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
sizeof "XBS5_LP64_OFF64" - 1); sizeof "XBS5_LP64_OFF64" - 1);
string_len += sizeof "XBS5_LP64_OFF64" - 1; string_len += sizeof "XBS5_LP64_OFF64" - 1;
} }
#endif #endif
#ifndef _XBS5_LPBIG_OFFBIG #ifndef _XBS5_LPBIG_OFFBIG
if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
#endif #endif
#if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0 #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
{ {
if (string_len) if (string_len)
restenvs[string_len++] = '\n'; restenvs[string_len++] = '\n';
memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
sizeof "XBS5_LPBIG_OFFBIG" - 1); sizeof "XBS5_LPBIG_OFFBIG" - 1);
string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
} }
#endif #endif
restenvs[string_len++] = '\0'; restenvs[string_len++] = '\0';
string = restenvs; string = restenvs;
}
break; break;
case _CS_XBS5_ILP32_OFF32_CFLAGS: case _CS_XBS5_ILP32_OFF32_CFLAGS: