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

MIPS: arc: Replace deprecated strcpy() with memcpy()

strcpy() is deprecated; use memcpy() instead.

Use pr_debug() instead of printk(KERN_DEBUG) to silence a checkpatch
warning.

Link: https://github.com/KSPP/linux/issues/88
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Thorsten Blum and committed by
Thomas Bogendoerfer
267ac0a8 19b32dbb

+13 -9
+13 -9
arch/mips/fw/arc/cmdline.c
··· 42 42 { 43 43 char *s; 44 44 int actr, i; 45 + size_t len; 45 46 46 47 actr = 1; /* Always ignore argv[0] */ 47 48 48 49 while (actr < argc) { 49 - for(i = 0; i < ARRAY_SIZE(used_arc); i++) { 50 - int len = strlen(used_arc[i][0]); 50 + for (i = 0; i < ARRAY_SIZE(used_arc); i++) { 51 + len = strlen(used_arc[i][0]); 51 52 52 53 if (!strncmp(prom_argv(actr), used_arc[i][0], len)) { 53 54 /* Ok, we want it. First append the replacement... */ ··· 58 57 s = strchr(prom_argv(actr), '='); 59 58 if (s) { 60 59 s++; 61 - strcpy(cp, s); 62 - cp += strlen(s); 60 + len = strlen(s); 61 + memcpy(cp, s, len + 1); 62 + cp += len; 63 63 } 64 64 *cp++ = ' '; 65 65 break; ··· 76 74 { 77 75 char *cp; 78 76 int actr, i; 77 + size_t len; 79 78 80 79 actr = 1; /* Always ignore argv[0] */ 81 80 ··· 89 86 90 87 while (actr < argc) { 91 88 for (i = 0; i < ARRAY_SIZE(ignored); i++) { 92 - int len = strlen(ignored[i]); 93 - 89 + len = strlen(ignored[i]); 94 90 if (!strncmp(prom_argv(actr), ignored[i], len)) 95 91 goto pic_cont; 96 92 } 93 + 97 94 /* Ok, we want it. */ 98 - strcpy(cp, prom_argv(actr)); 99 - cp += strlen(prom_argv(actr)); 95 + len = strlen(prom_argv(actr)); 96 + memcpy(cp, prom_argv(actr), len + 1); 97 + cp += len; 100 98 *cp++ = ' '; 101 99 102 100 pic_cont: ··· 109 105 *cp = '\0'; 110 106 111 107 #ifdef DEBUG_CMDLINE 112 - printk(KERN_DEBUG "prom cmdline: %s\n", arcs_cmdline); 108 + pr_debug("prom cmdline: %s\n", arcs_cmdline); 113 109 #endif 114 110 }