@@ -1328,8 +1328,8 @@ mptctl_getiocinfo (MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
1328
1328
1329
1329
/* Set the Version Strings.
1330
1330
*/
1331
- strncpy (karg -> driverVersion , MPT_LINUX_PACKAGE_NAME , MPT_IOCTL_VERSION_LENGTH );
1332
- karg -> driverVersion [ MPT_IOCTL_VERSION_LENGTH - 1 ] = '\0' ;
1331
+ strscpy_pad (karg -> driverVersion , MPT_LINUX_PACKAGE_NAME ,
1332
+ sizeof ( karg -> driverVersion )) ;
1333
1333
1334
1334
karg -> busChangeEvent = 0 ;
1335
1335
karg -> hostId = ioc -> pfacts [port ].PortSCSIID ;
@@ -1493,10 +1493,8 @@ mptctl_readtest (MPT_ADAPTER *ioc, unsigned long arg)
1493
1493
#else
1494
1494
karg .chip_type = ioc -> pcidev -> device ;
1495
1495
#endif
1496
- strncpy (karg .name , ioc -> name , MPT_MAX_NAME );
1497
- karg .name [MPT_MAX_NAME - 1 ]= '\0' ;
1498
- strncpy (karg .product , ioc -> prod_name , MPT_PRODUCT_LENGTH );
1499
- karg .product [MPT_PRODUCT_LENGTH - 1 ]= '\0' ;
1496
+ strscpy_pad (karg .name , ioc -> name , sizeof (karg .name ));
1497
+ strscpy_pad (karg .product , ioc -> prod_name , sizeof (karg .product ));
1500
1498
1501
1499
/* Copy the data from kernel memory to user memory
1502
1500
*/
@@ -2394,7 +2392,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
2394
2392
cfg .dir = 0 ; /* read */
2395
2393
cfg .timeout = 10 ;
2396
2394
2397
- strncpy (karg .serial_number , " " , 24 );
2395
+ strscpy_pad (karg .serial_number , " " , sizeof ( karg . serial_number ) );
2398
2396
if (mpt_config (ioc , & cfg ) == 0 ) {
2399
2397
if (cfg .cfghdr .hdr -> PageLength > 0 ) {
2400
2398
/* Issue the second config page request */
@@ -2408,8 +2406,9 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
2408
2406
if (mpt_config (ioc , & cfg ) == 0 ) {
2409
2407
ManufacturingPage0_t * pdata = (ManufacturingPage0_t * ) pbuf ;
2410
2408
if (strlen (pdata -> BoardTracerNumber ) > 1 ) {
2411
- strscpy (karg .serial_number ,
2412
- pdata -> BoardTracerNumber , 24 );
2409
+ strscpy_pad (karg .serial_number ,
2410
+ pdata -> BoardTracerNumber ,
2411
+ sizeof (karg .serial_number ));
2413
2412
}
2414
2413
}
2415
2414
dma_free_coherent (& ioc -> pcidev -> dev ,
@@ -2456,7 +2455,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
2456
2455
}
2457
2456
}
2458
2457
2459
- /*
2458
+ /*
2460
2459
* Gather ISTWI(Industry Standard Two Wire Interface) Data
2461
2460
*/
2462
2461
if ((mf = mpt_get_msg_frame (mptctl_id , ioc )) == NULL ) {
0 commit comments