Commit 00e24565 authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: ips: Convert strnlen() to memcpy() since result should not be NUL terminated 

Fixes the following W=1 kernel build warning(s):

 In file included from arch/arm/include/asm/io.h:23,
 from drivers/scsi/ips.c:164:
 In function ‘strncpy’,
 inlined from ‘ips_send_cmd’ at drivers/scsi/ips.c:3522:6:
 include/linux/string.h:297:30: warning: ‘__builtin_strncpy’ output
 truncated before terminating nul cop ying 4 bytes from a string of the same length [-Wstringop-truncation]
 297 | #define __underlying_strncpy __builtin_strncpy
 | ^
 include/linux/string.h:307:9: note: in expansion of macro ‘__underlying_strncpy’
 307 | return __underlying_strncpy(p, q, size);
 | ^~~~~~~~~~~~~~~~~~~~
 NB: Lots of these - snipping for brevity

Link: https://lore.kernel.org/r/20200723122446.1329773-14-lee.jones@linaro.org


Cc: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
Cc: ipslinux@adaptec.com
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ffe1757e

drivers/scsi/ips.c

+11 −11
Original line number Diff line number Diff line
@@ -2239,7 +2239,7 @@ ips_get_bios_version(ips_ha_t * ha, int intr) 
	major = 0;

	minor = 0;



	strncpy(ha->bios_version, "       ?", 8);

	memcpy(ha->bios_version, "       ?", 8);



	if (ha->pcidev->device == IPS_DEVICEID_COPPERHEAD) {

		if (IPS_USE_MEMIO(ha)) {
@@ -3515,11 +3515,11 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb) 
					inquiry.Flags[1] =

					    IPS_SCSI_INQ_WBus16 |

					    IPS_SCSI_INQ_Sync;

					strncpy(inquiry.VendorId, "IBM     ",

					memcpy(inquiry.VendorId, "IBM     ",

						8);

					strncpy(inquiry.ProductId,

					memcpy(inquiry.ProductId,

						"SERVERAID       ", 16);

					strncpy(inquiry.ProductRevisionLevel,

					memcpy(inquiry.ProductRevisionLevel,

						"1.00", 4);



					ips_scmd_buf_write(scb->scsi_cmd,
@@ -4036,9 +4036,9 @@ ips_inquiry(ips_ha_t * ha, ips_scb_t * scb) 
	inquiry.Flags[0] = IPS_SCSI_INQ_Address16;

	inquiry.Flags[1] =

	    IPS_SCSI_INQ_WBus16 | IPS_SCSI_INQ_Sync | IPS_SCSI_INQ_CmdQue;

	strncpy(inquiry.VendorId, "IBM     ", 8);

	strncpy(inquiry.ProductId, "SERVERAID       ", 16);

	strncpy(inquiry.ProductRevisionLevel, "1.00", 4);

	memcpy(inquiry.VendorId, "IBM     ", 8);

	memcpy(inquiry.ProductId, "SERVERAID       ", 16);

	memcpy(inquiry.ProductRevisionLevel, "1.00", 4);



	ips_scmd_buf_write(scb->scsi_cmd, &inquiry, sizeof (inquiry));
@@ -5620,10 +5620,10 @@ ips_write_driver_status(ips_ha_t * ha, int intr) 
	/* change values (as needed) */

	ha->nvram->operating_system = IPS_OS_LINUX;

	ha->nvram->adapter_type = ha->ad_type;

	strncpy((char *) ha->nvram->driver_high, IPS_VERSION_HIGH, 4);

	strncpy((char *) ha->nvram->driver_low, IPS_VERSION_LOW, 4);

	strncpy((char *) ha->nvram->bios_high, ha->bios_version, 4);

	strncpy((char *) ha->nvram->bios_low, ha->bios_version + 4, 4);

	memcpy((char *) ha->nvram->driver_high, IPS_VERSION_HIGH, 4);

	memcpy((char *) ha->nvram->driver_low, IPS_VERSION_LOW, 4);

	memcpy((char *) ha->nvram->bios_high, ha->bios_version, 4);

	memcpy((char *) ha->nvram->bios_low, ha->bios_version + 4, 4);



	ha->nvram->versioning = 0;	/* Indicate the Driver Does Not Support Versioning */

CRA Git | Maintained and supported by SUSTech CRA and CCSE