Skip to content

Commit 01c57b7

Browse files
James BottomleyJames Bottomley
authored andcommitted
Merge branch 'misc' into for-next
2 parents e218711 + b6f2e06 commit 01c57b7

File tree

7 files changed

+400
-168
lines changed

7 files changed

+400
-168
lines changed

drivers/message/fusion/mptctl.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,8 +1328,8 @@ mptctl_getiocinfo (MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
13281328

13291329
/* Set the Version Strings.
13301330
*/
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));
13331333

13341334
karg->busChangeEvent = 0;
13351335
karg->hostId = ioc->pfacts[port].PortSCSIID;
@@ -1493,10 +1493,8 @@ mptctl_readtest (MPT_ADAPTER *ioc, unsigned long arg)
14931493
#else
14941494
karg.chip_type = ioc->pcidev->device;
14951495
#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));
15001498

15011499
/* Copy the data from kernel memory to user memory
15021500
*/
@@ -2394,7 +2392,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
23942392
cfg.dir = 0; /* read */
23952393
cfg.timeout = 10;
23962394

2397-
strncpy(karg.serial_number, " ", 24);
2395+
strscpy_pad(karg.serial_number, " ", sizeof(karg.serial_number));
23982396
if (mpt_config(ioc, &cfg) == 0) {
23992397
if (cfg.cfghdr.hdr->PageLength > 0) {
24002398
/* Issue the second config page request */
@@ -2408,8 +2406,9 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
24082406
if (mpt_config(ioc, &cfg) == 0) {
24092407
ManufacturingPage0_t *pdata = (ManufacturingPage0_t *) pbuf;
24102408
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));
24132412
}
24142413
}
24152414
dma_free_coherent(&ioc->pcidev->dev,
@@ -2456,7 +2455,7 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size)
24562455
}
24572456
}
24582457

2459-
/*
2458+
/*
24602459
* Gather ISTWI(Industry Standard Two Wire Interface) Data
24612460
*/
24622461
if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {

drivers/message/fusion/mptsas.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2964,17 +2964,17 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc,
29642964
goto out_free;
29652965

29662966
manufacture_reply = data_out + sizeof(struct rep_manu_request);
2967-
strncpy(edev->vendor_id, manufacture_reply->vendor_id,
2968-
SAS_EXPANDER_VENDOR_ID_LEN);
2969-
strncpy(edev->product_id, manufacture_reply->product_id,
2970-
SAS_EXPANDER_PRODUCT_ID_LEN);
2971-
strncpy(edev->product_rev, manufacture_reply->product_rev,
2972-
SAS_EXPANDER_PRODUCT_REV_LEN);
2967+
strscpy(edev->vendor_id, manufacture_reply->vendor_id,
2968+
sizeof(edev->vendor_id));
2969+
strscpy(edev->product_id, manufacture_reply->product_id,
2970+
sizeof(edev->product_id));
2971+
strscpy(edev->product_rev, manufacture_reply->product_rev,
2972+
sizeof(edev->product_rev));
29732973
edev->level = manufacture_reply->sas_format;
29742974
if (manufacture_reply->sas_format) {
2975-
strncpy(edev->component_vendor_id,
2975+
strscpy(edev->component_vendor_id,
29762976
manufacture_reply->component_vendor_id,
2977-
SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);
2977+
sizeof(edev->component_vendor_id));
29782978
tmp = (u8 *)&manufacture_reply->component_id;
29792979
edev->component_id = tmp[0] << 8 | tmp[1];
29802980
edev->component_revision_id =

0 commit comments

Comments
 (0)