2014-07-26 14:26:16

by Rickard Strandqvist

Subject: [PATCH] s390: block: dasd_devmap.c: Cleaning up missing null-terminate in conjunction with strncpy

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/s390/block/dasd_devmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 2ead7e7..4a60ef8 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -424,7 +424,7 @@ dasd_add_busid(const char *bus_id, int features)
if (!devmap) {
/* This bus_id is new. */
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->device = NULL;
list_add(&new->list, &dasd_hashlists[hash]);
--
1.7.10.4

2014-07-28 14:37:45

by Jeff Moyer

Subject: Re: [PATCH] s390: block: dasd_devmap.c: Cleaning up missing null-terminate in conjunction with strncpy

Rickard Strandqvist <[email protected]> writes:

> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
>
> Signed-off-by: Rickard Strandqvist <[email protected]>
> ---
> drivers/s390/block/dasd_devmap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
> index 2ead7e7..4a60ef8 100644
> --- a/drivers/s390/block/dasd_devmap.c
> +++ b/drivers/s390/block/dasd_devmap.c
> @@ -424,7 +424,7 @@ dasd_add_busid(const char *bus_id, int features)
> if (!devmap) {
> /* This bus_id is new. */
> 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);

NACK

kzalloc'd.

Did you put thought into *any* of these conversions?