Commit c6756b7d authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky

s390/dasd,zfcp: fix gcc 8 stringop-truncation warnings

ccw "busid" should always be NUL-terminated, as evident from e.g.
get_ccwdev_by_busid doing "return (strcmp(bus_id, dev_name(dev)) == 0)".

Replace all strncpy initializing busid with strlcpy. This fixes the
following gcc 8 warnings:

drivers/s390/scsi/zfcp_aux.c:104:2: warning: 'strncpy' specified bound 20
equals destination size [-Wstringop-truncation]
  strncpy(busid, token, ZFCP_BUS_ID_SIZE);

drivers/s390/block/dasd_eer.c:316:2: warning: 'strncpy' specified bound 10
equals destination size [-Wstringop-truncation]
  strncpy(header.busid, dev_name(&device->cdev->dev), DASD_EER_BUSID_SIZE);

drivers/s390/block/dasd_eer.c:359:2: warning: 'strncpy' specified bound 10
equals destination size [-Wstringop-truncation]
  strncpy(header.busid, dev_name(&device->cdev->dev), DASD_EER_BUSID_SIZE);

drivers/s390/block/dasd_devmap.c:429:3: warning: 'strncpy' specified bound
20 equals destination size [-Wstringop-truncation]
   strncpy(new->bus_id, bus_id, DASD_BUS_ID_SIZE);
Acked-by: default avatarStefan Haberland <sth@linux.ibm.com>
Acked-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6b2ddf33
...@@ -426,7 +426,7 @@ dasd_add_busid(const char *bus_id, int features) ...@@ -426,7 +426,7 @@ dasd_add_busid(const char *bus_id, int features)
if (!devmap) { if (!devmap) {
/* This bus_id is new. */ /* This bus_id is new. */
new->devindex = dasd_max_devindex++; new->devindex = dasd_max_devindex++;
strncpy(new->bus_id, bus_id, DASD_BUS_ID_SIZE); strlcpy(new->bus_id, bus_id, DASD_BUS_ID_SIZE);
new->features = features; new->features = features;
new->device = NULL; new->device = NULL;
list_add(&new->list, &dasd_hashlists[hash]); list_add(&new->list, &dasd_hashlists[hash]);
......
...@@ -313,7 +313,7 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device, ...@@ -313,7 +313,7 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device,
ktime_get_real_ts64(&ts); ktime_get_real_ts64(&ts);
header.tv_sec = ts.tv_sec; header.tv_sec = ts.tv_sec;
header.tv_usec = ts.tv_nsec / NSEC_PER_USEC; header.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
strncpy(header.busid, dev_name(&device->cdev->dev), strlcpy(header.busid, dev_name(&device->cdev->dev),
DASD_EER_BUSID_SIZE); DASD_EER_BUSID_SIZE);
spin_lock_irqsave(&bufferlock, flags); spin_lock_irqsave(&bufferlock, flags);
...@@ -356,7 +356,7 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device, ...@@ -356,7 +356,7 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device,
ktime_get_real_ts64(&ts); ktime_get_real_ts64(&ts);
header.tv_sec = ts.tv_sec; header.tv_sec = ts.tv_sec;
header.tv_usec = ts.tv_nsec / NSEC_PER_USEC; header.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
strncpy(header.busid, dev_name(&device->cdev->dev), strlcpy(header.busid, dev_name(&device->cdev->dev),
DASD_EER_BUSID_SIZE); DASD_EER_BUSID_SIZE);
spin_lock_irqsave(&bufferlock, flags); spin_lock_irqsave(&bufferlock, flags);
......
...@@ -101,7 +101,7 @@ static void __init zfcp_init_device_setup(char *devstr) ...@@ -101,7 +101,7 @@ static void __init zfcp_init_device_setup(char *devstr)
token = strsep(&str, ","); token = strsep(&str, ",");
if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE) if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE)
goto err_out; goto err_out;
strncpy(busid, token, ZFCP_BUS_ID_SIZE); strlcpy(busid, token, ZFCP_BUS_ID_SIZE);
token = strsep(&str, ","); token = strsep(&str, ",");
if (!token || kstrtoull(token, 0, (unsigned long long *) &wwpn)) if (!token || kstrtoull(token, 0, (unsigned long long *) &wwpn))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment