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

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>

authored by

Thorsten Blum and committed by
Thomas Bogendoerfer e34b690f 2c7c8cf6

+16 -15
+16 -15
arch/mips/cavium-octeon/executive/octeon-model.c
··· 25 25 * Contact Cavium Networks for more information 26 26 ***********************license end**************************************/ 27 27 28 + #include <linux/string.h> 28 29 #include <asm/octeon/octeon.h> 29 30 30 31 enum octeon_feature_bits __octeon_feature_bits __read_mostly; ··· 209 208 */ 210 209 switch (chip_id & 0xf) { 211 210 case 0: 212 - strcpy(pass, "1.X"); 211 + strscpy(pass, "1.X"); 213 212 break; 214 213 case 1: 215 - strcpy(pass, "2.X"); 214 + strscpy(pass, "2.X"); 216 215 break; 217 216 case 3: 218 - strcpy(pass, "3.X"); 217 + strscpy(pass, "3.X"); 219 218 break; 220 219 default: 221 - strcpy(pass, "X.X"); 220 + strscpy(pass, "X.X"); 222 221 break; 223 222 } 224 223 break; ··· 233 232 */ 234 233 switch (chip_id & 0xf) { 235 234 case 0: 236 - strcpy(pass, "1.0"); 235 + strscpy(pass, "1.0"); 237 236 break; 238 237 case 2: 239 - strcpy(pass, "1.1"); 238 + strscpy(pass, "1.1"); 240 239 break; 241 240 default: 242 - strcpy(pass, "X.X"); 241 + strscpy(pass, "X.X"); 243 242 break; 244 243 } 245 244 break; ··· 254 253 */ 255 254 switch (chip_id & 0xf) { 256 255 case 0: 257 - strcpy(pass, "1.0"); 256 + strscpy(pass, "1.0"); 258 257 break; 259 258 case 2: 260 - strcpy(pass, "1.1"); 259 + strscpy(pass, "1.1"); 261 260 break; 262 261 default: 263 - strcpy(pass, "X.X"); 262 + strscpy(pass, "X.X"); 264 263 break; 265 264 } 266 265 break; ··· 274 273 if ((chip_id & 0xFF) < 0x8) { 275 274 switch (chip_id & 0x3) { 276 275 case 0: 277 - strcpy(pass, "1.0"); 276 + strscpy(pass, "1.0"); 278 277 break; 279 278 case 1: 280 - strcpy(pass, "1.1"); 279 + strscpy(pass, "1.1"); 281 280 break; 282 281 case 3: 283 - strcpy(pass, "1.2"); 282 + strscpy(pass, "1.2"); 284 283 break; 285 284 default: 286 - strcpy(pass, "1.X"); 285 + strscpy(pass, "1.X"); 287 286 break; 288 287 } 289 288 } ··· 448 447 default: 449 448 family = "XX"; 450 449 core_model = "XX"; 451 - strcpy(pass, "X.X"); 450 + strscpy(pass, "X.X"); 452 451 suffix = "XXX"; 453 452 break; 454 453 }