Skip to content

Commit e34b690

Browse files
tobluxtsbogend
authored andcommitted
MIPS: octeon: Replace deprecated strcpy() in octeon_model_get_string_buffer()
strcpy() is deprecated; use strscpy() instead. Link: KSPP#88 Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent 2c7c8cf commit e34b690

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

arch/mips/cavium-octeon/executive/octeon-model.c

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* Contact Cavium Networks for more information
2626
***********************license end**************************************/
2727

28+
#include <linux/string.h>
2829
#include <asm/octeon/octeon.h>
2930

3031
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,
208209
*/
209210
switch (chip_id & 0xf) {
210211
case 0:
211-
strcpy(pass, "1.X");
212+
strscpy(pass, "1.X");
212213
break;
213214
case 1:
214-
strcpy(pass, "2.X");
215+
strscpy(pass, "2.X");
215216
break;
216217
case 3:
217-
strcpy(pass, "3.X");
218+
strscpy(pass, "3.X");
218219
break;
219220
default:
220-
strcpy(pass, "X.X");
221+
strscpy(pass, "X.X");
221222
break;
222223
}
223224
break;
@@ -232,13 +233,13 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
232233
*/
233234
switch (chip_id & 0xf) {
234235
case 0:
235-
strcpy(pass, "1.0");
236+
strscpy(pass, "1.0");
236237
break;
237238
case 2:
238-
strcpy(pass, "1.1");
239+
strscpy(pass, "1.1");
239240
break;
240241
default:
241-
strcpy(pass, "X.X");
242+
strscpy(pass, "X.X");
242243
break;
243244
}
244245
break;
@@ -253,13 +254,13 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
253254
*/
254255
switch (chip_id & 0xf) {
255256
case 0:
256-
strcpy(pass, "1.0");
257+
strscpy(pass, "1.0");
257258
break;
258259
case 2:
259-
strcpy(pass, "1.1");
260+
strscpy(pass, "1.1");
260261
break;
261262
default:
262-
strcpy(pass, "X.X");
263+
strscpy(pass, "X.X");
263264
break;
264265
}
265266
break;
@@ -273,16 +274,16 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
273274
if ((chip_id & 0xFF) < 0x8) {
274275
switch (chip_id & 0x3) {
275276
case 0:
276-
strcpy(pass, "1.0");
277+
strscpy(pass, "1.0");
277278
break;
278279
case 1:
279-
strcpy(pass, "1.1");
280+
strscpy(pass, "1.1");
280281
break;
281282
case 3:
282-
strcpy(pass, "1.2");
283+
strscpy(pass, "1.2");
283284
break;
284285
default:
285-
strcpy(pass, "1.X");
286+
strscpy(pass, "1.X");
286287
break;
287288
}
288289
}
@@ -447,7 +448,7 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id,
447448
default:
448449
family = "XX";
449450
core_model = "XX";
450-
strcpy(pass, "X.X");
451+
strscpy(pass, "X.X");
451452
suffix = "XXX";
452453
break;
453454
}

0 commit comments

Comments
 (0)