Commit 1f7b5f94 authored by Justin Tee's avatar Justin Tee Committed by Martin K. Petersen
Browse files

scsi: lpfc: Replace outdated strncpy() with strscpy() 



The kernel test robot pointed out non-NULL terminated string possibilities
when using strncpy() in lpfc_xcvr_data_show() routine.  Although we
manually set the NULL character after strncpy(), strncpy() usage is
outdated.

Replace all strncpy() usages with the preferred strscpy() API.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6058304a

drivers/scsi/lpfc/lpfc_attr.c

+5 −10
Original line number Diff line number Diff line
@@ -1905,8 +1905,7 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr, 
		goto out_free_rdp;

	}



	strncpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_NAME], 16);

	chbuf[16] = 0;

	strscpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_NAME], 16);



	len = scnprintf(buf, PAGE_SIZE - len, "VendorName:\t%s\n", chbuf);

	len += scnprintf(buf + len, PAGE_SIZE - len,
@@ -1914,17 +1913,13 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr, 
			 (uint8_t)rdp_context->page_a0[SSF_VENDOR_OUI],

			 (uint8_t)rdp_context->page_a0[SSF_VENDOR_OUI + 1],

			 (uint8_t)rdp_context->page_a0[SSF_VENDOR_OUI + 2]);

	strncpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_PN], 16);

	chbuf[16] = 0;

	strscpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_PN], 16);

	len += scnprintf(buf + len, PAGE_SIZE - len, "VendorPN:\t%s\n", chbuf);

	strncpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_SN], 16);

	chbuf[16] = 0;

	strscpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_SN], 16);

	len += scnprintf(buf + len, PAGE_SIZE - len, "VendorSN:\t%s\n", chbuf);

	strncpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_REV], 4);

	chbuf[4] = 0;

	strscpy(chbuf, &rdp_context->page_a0[SSF_VENDOR_REV], 4);

	len += scnprintf(buf + len, PAGE_SIZE - len, "VendorRev:\t%s\n", chbuf);

	strncpy(chbuf, &rdp_context->page_a0[SSF_DATE_CODE], 8);

	chbuf[8] = 0;

	strscpy(chbuf, &rdp_context->page_a0[SSF_DATE_CODE], 8);

	len += scnprintf(buf + len, PAGE_SIZE - len, "DateCode:\t%s\n", chbuf);

	len += scnprintf(buf + len, PAGE_SIZE - len, "Identifier:\t%xh\n",

			 (uint8_t)rdp_context->page_a0[SSF_IDENTIFIER]);