emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zcip: fix slow environment leak

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-22 03:04:20 +02:00
parent bbf17bbf32
commit e4f6bfd6fe
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libbb.h
View File

@ -1485,6 +1485,9 @@ extern void selinux_or_die(void) FAST_FUNC;
* HOME=pw->pw_dir * HOME=pw->pw_dir
* SHELL=shell * SHELL=shell
* else does nothing * else does nothing
*
* NB: CHANGEENV and CLEARENV use setenv() - this leaks memory!
* If setup_environment() is used is vforked child, this leaks memory _in parent too_!
*/ */
#define SETUP_ENV_CHANGEENV (1 << 0) #define SETUP_ENV_CHANGEENV (1 << 0)
#define SETUP_ENV_CLEARENV (1 << 1) #define SETUP_ENV_CLEARENV (1 << 1)

6
networking/ifplugd.c
View File

@ -342,10 +342,8 @@ static int run_script(const char *action)
/* r < 0 - can't exec, 0 <= r < 0x180 - exited, >=0x180 - killed by sig (r-0x180) */ /* r < 0 - can't exec, 0 <= r < 0x180 - exited, >=0x180 - killed by sig (r-0x180) */
r = spawn_and_wait(argv); r = spawn_and_wait(argv);
unsetenv(IFPLUGD_ENV_PREVIOUS); bb_unsetenv_and_free(env_PREVIOUS);
unsetenv(IFPLUGD_ENV_CURRENT); bb_unsetenv_and_free(env_CURRENT);
free(env_PREVIOUS);
free(env_CURRENT);
bb_error_msg("exit code: %d", r & 0xff); bb_error_msg("exit code: %d", r & 0xff);
return (option_mask32 & FLAG_IGNORE_RETVAL) ? 0 : r; return (option_mask32 & FLAG_IGNORE_RETVAL) ? 0 : r;

9
networking/zcip.c
View File

@ -183,6 +183,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
int status; int status;
const char *addr = addr; /* for gcc */ const char *addr = addr; /* for gcc */
const char *fmt = "%s %s %s" + 3; const char *fmt = "%s %s %s" + 3;
char *env_ip = env_ip;
argv[2] = (char*)param; argv[2] = (char*)param;
@ -190,12 +191,16 @@ static int run(char *argv[3], const char *param, uint32_t nip)
if (nip != 0) { if (nip != 0) {
addr = nip_to_a(nip); addr = nip_to_a(nip);
xsetenv("ip", addr); /* Must not use setenv() repeatedly, it leaks memory. Use putenv() */
env_ip = xasprintf("ip=%s", addr);
putenv(env_ip);
fmt -= 3; fmt -= 3;
} }
bb_error_msg(fmt, argv[2], argv[0], addr); bb_error_msg(fmt, argv[2], argv[0], addr);
status = spawn_and_wait(argv + 1); status = spawn_and_wait(argv + 1);
if (nip != 0)
bb_unsetenv_and_free(env_ip);
if (status < 0) { if (status < 0) {
bb_perror_msg("%s %s %s" + 3, argv[2], argv[0]); bb_perror_msg("%s %s %s" + 3, argv[2], argv[0]);
return -errno; return -errno;