Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Alchemy: Use strlcat() for the command line arguments

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/928/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Yoichi Yuasa and committed by
Ralf Baechle
10229f37 ae7cbef5

+5 -14
+5 -14
arch/mips/alchemy/common/prom.c
··· 45 45 46 46 void prom_init_cmdline(void) 47 47 { 48 - char *cp; 49 - int actr; 48 + int i; 50 49 51 - actr = 1; /* Always ignore argv[0] */ 52 - 53 - cp = &(arcs_cmdline[0]); 54 - while (actr < prom_argc) { 55 - strcpy(cp, prom_argv[actr]); 56 - cp += strlen(prom_argv[actr]); 57 - *cp++ = ' '; 58 - actr++; 50 + for (i = 1; i < prom_argc; i++) { 51 + strlcat(arcs_cmdline, prom_argv[i], COMMAND_LINE_SIZE); 52 + if (i < (prom_argc - 1)) 53 + strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); 59 54 } 60 - if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */ 61 - --cp; 62 - if (prom_argc > 1) 63 - *cp = '\0'; 64 55 } 65 56 66 57 char *prom_getenv(char *envname)