d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only assign the environ in the startup code when environ is NULL.

Browse Source 
Preloaded library could have changed the environment, and
unconditional assingment to the environ undoes the customization.
The binaries needs to be recompiled to get the fix.

Move the common code to set up environ and __progname into the helper.
Note that ia64 possibly not fixed, due to it still using old csu.

Reported and tested by:	John Hein <jhein@symmetricom.com>
Reviewed by:	kan, scf
Approved by:	secteam (simon)
MFC after:	2 weeks
This commit is contained in:
Konstantin Belousov 2013-01-07 17:58:27 +00:00
parent 878b1fbdce
commit d549ead6a9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245133
8 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/csu/amd64/crt1.c
View File

@ -61,9 +61,7 @@ _start(char **ap, void (*cleanup)(void))
argc = *(long *)(void *)ap;
argv = ap + 1;
env = ap + 2 + argc;
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (&_DYNAMIC != NULL)
atexit(cleanup);

5
lib/csu/arm/crt1.c
View File

@ -98,10 +98,7 @@ __start(int argc, char **argv, char **env, struct ps_strings *ps_strings,
const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void))
{
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (ps_strings != (struct ps_strings *)0)
__ps_strings = ps_strings;

14
lib/csu/common/ignore_init.c
View File

@ -87,14 +87,18 @@ handle_static_init(int argc, char **argv, char **env)
}
static inline void
handle_progname(const char *v)
handle_argv(int argc, char *argv[], char **env)
{
const char *s;
__progname = v;
for (s = __progname; *s != '\0'; s++) {
if (*s == '/')
__progname = s + 1;
if (environ == NULL)
environ = env;
if (argc > 0 && argv[0] != NULL) {
__progname = argv[0];
for (s = __progname; *s != '\0'; s++) {
if (*s == '/')
__progname = s + 1;
}
}
}

5
lib/csu/i386-elf/crt1_c.c
View File

@ -61,10 +61,7 @@ _start1(fptr cleanup, int argc, char *argv[])
char **env;
env = argv + argc + 1;
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (&_DYNAMIC != NULL)
atexit(cleanup);
else

4
lib/csu/mips/crt1.c
View File

@ -71,9 +71,7 @@ __start(char **ap,
argc = * (long *) ap;
argv = ap + 1;
env = ap + 2 + argc;
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (&_DYNAMIC != NULL)
atexit(cleanup);

4
lib/csu/powerpc/crt1.c
View File

@ -81,10 +81,8 @@ _start(int argc, char **argv, char **env,
struct ps_strings *ps_strings)
{
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (ps_strings != (struct ps_strings *)0)
__ps_strings = ps_strings;

5
lib/csu/powerpc64/crt1.c
View File

@ -81,10 +81,7 @@ _start(int argc, char **argv, char **env,
struct ps_strings *ps_strings)
{
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (ps_strings != (struct ps_strings *)0)
__ps_strings = ps_strings;

4
lib/csu/sparc64/crt1.c
View File

@ -85,9 +85,7 @@ _start(char **ap, void (*cleanup)(void), struct Struct_Obj_Entry *obj __unused,
argc = *(long *)(void *)ap;
argv = ap + 1;
env = ap + 2 + argc;
environ = env;
if (argc > 0 && argv[0] != NULL)
handle_progname(argv[0]);
handle_argv(argc, argv, env);
if (&_DYNAMIC != NULL)
atexit(cleanup);