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

hush: fix potential buffer overflow on NOMMU

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-01-12 19:28:10 +01:00
parent e89a241b9e
commit 6c93b24ce9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/hush.c
View File

@@ -2919,7 +2919,9 @@ static void re_execute_shell(char ***to_free, const char *s,
char *g_argv0, char **g_argv, char *g_argv0, char **g_argv,
char **builtin_argv) char **builtin_argv)
{ {
char param_buf[sizeof("-$%x:%x:%x:%x:%x") + sizeof(unsigned) * 2]; #define NOMMU_HACK_FMT ("-$%x:%x:%x:%x:%x:%llx" IF_HUSH_LOOPS(":%x"))
/* delims + 2 * (number of bytes in printed hex numbers) */
char param_buf[sizeof(NOMMU_HACK_FMT) + 2 * (sizeof(int)*6 + sizeof(long long)*1)];
char *heredoc_argv[4]; char *heredoc_argv[4];
struct variable *cur; struct variable *cur;
# if ENABLE_HUSH_FUNCTIONS # if ENABLE_HUSH_FUNCTIONS
@@ -2953,7 +2955,7 @@ static void re_execute_shell(char ***to_free, const char *s,
} }
} }
sprintf(param_buf, "-$%x:%x:%x:%x:%x:%llx" IF_HUSH_LOOPS(":%x") sprintf(param_buf, NOMMU_HACK_FMT
, (unsigned) G.root_pid , (unsigned) G.root_pid
, (unsigned) G.root_ppid , (unsigned) G.root_ppid
, (unsigned) G.last_bg_pid , (unsigned) G.last_bg_pid
@@ -2962,7 +2964,8 @@ static void re_execute_shell(char ***to_free, const char *s,
, empty_trap_mask , empty_trap_mask
IF_HUSH_LOOPS(, G.depth_of_loop) IF_HUSH_LOOPS(, G.depth_of_loop)
); );
/* 1:hush 2:-$<pid>:<pid>:<exitcode>:<depth> <vars...> <funcs...> #undef NOMMU_HACK_FMT
/* 1:hush 2:-$<pid>:<pid>:<exitcode>:<etc...> <vars...> <funcs...>
* 3:-c 4:<cmd> 5:<arg0> <argN...> 6:NULL * 3:-c 4:<cmd> 5:<arg0> <argN...> 6:NULL
*/ */
cnt += 6; cnt += 6;