Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIPS: octeon: Replace deprecated strcpy() in octeon_model_get_string_buffer() 

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

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>
This commit is contained in:
Thorsten Blum 2025-08-17 20:37:17 +02:00 committed by Thomas Bogendoerfer
parent 2c7c8cf656
commit e34b690f58
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/mips/cavium-octeon/executive/octeon-model.c
View File

@ -25,6 +25,7 @@
* Contact Cavium Networks for more information * Contact Cavium Networks for more information
***********************license end**************************************/ ***********************license end**************************************/
#include <linux/string.h>
#include <asm/octeon/octeon.h> #include <asm/octeon/octeon.h>
enum octeon_feature_bits __octeon_feature_bits __read_mostly; enum octeon_feature_bits __octeon_feature_bits __read_mostly;
@ -208,16 +209,16 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
*/ */
switch (chip_id & 0xf) { switch (chip_id & 0xf) {
case 0: case 0:
strcpy(pass, "1.X"); strscpy(pass, "1.X");
break; break;
case 1: case 1:
strcpy(pass, "2.X"); strscpy(pass, "2.X");
break; break;
case 3: case 3:
strcpy(pass, "3.X"); strscpy(pass, "3.X");
break; break;
default: default:
strcpy(pass, "X.X"); strscpy(pass, "X.X");
break; break;
} }
break; break;
@ -232,13 +233,13 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
*/ */
switch (chip_id & 0xf) { switch (chip_id & 0xf) {
case 0: case 0:
strcpy(pass, "1.0"); strscpy(pass, "1.0");
break; break;
case 2: case 2:
strcpy(pass, "1.1"); strscpy(pass, "1.1");
break; break;
default: default:
strcpy(pass, "X.X"); strscpy(pass, "X.X");
break; break;
} }
break; break;
@ -253,13 +254,13 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
*/ */
switch (chip_id & 0xf) { switch (chip_id & 0xf) {
case 0: case 0:
strcpy(pass, "1.0"); strscpy(pass, "1.0");
break; break;
case 2: case 2:
strcpy(pass, "1.1"); strscpy(pass, "1.1");
break; break;
default: default:
strcpy(pass, "X.X"); strscpy(pass, "X.X");
break; break;
} }
break; break;
@ -273,16 +274,16 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
if ((chip_id & 0xFF) < 0x8) { if ((chip_id & 0xFF) < 0x8) {
switch (chip_id & 0x3) { switch (chip_id & 0x3) {
case 0: case 0:
strcpy(pass, "1.0"); strscpy(pass, "1.0");
break; break;
case 1: case 1:
strcpy(pass, "1.1"); strscpy(pass, "1.1");
break; break;
case 3: case 3:
strcpy(pass, "1.2"); strscpy(pass, "1.2");
break; break;
default: default:
strcpy(pass, "1.X"); strscpy(pass, "1.X");
break; break;
} }
} }
@ -447,7 +448,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
default: default:
family = "XX"; family = "XX";
core_model = "XX"; core_model = "XX";
strcpy(pass, "X.X"); strscpy(pass, "X.X");
suffix = "XXX"; suffix = "XXX";
break; break;
} }