Skip to contentSkip to conversation

block/rnbd-clt: fix overlapping snprintf arguments

PATCH In review Arnd Bergmann 2 participants 2 messages Mar 23, 2021 – Mar 24, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block/rnbd-clt: fix overlapping snprintf arguments

From: Arnd Bergmann <[email protected]>

The -Wrestrict warning (disabled by default) points out undefined behavior calling snprintf():

drivers/block/rnbd/rnbd-clt-sysfs.c: In function 'rnbd_clt_get_path_name':
drivers/block/rnbd/rnbd-clt-sysfs.c:486:8: error: 'snprintf' argument 4 overlaps destination object 'buf' [-Werror=restrict]

  486 |  ret = snprintf(buf, len, "%s@%s", buf, dev->sess->sessname);
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/block/rnbd/rnbd-clt-sysfs.c:472:67: note: destination object referenced by 'restrict'-qualified argument 1 was declared here
472 | static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,
| ~~~~~~^~~

This can be simplified by using a single snprintf() to print the whole buffer, avoiding the undefined behavior.

Fixes 91f4acb2801c ("block/rnbd-clt: support mapping two devices with the same name from different servers")
---
 drivers/block/rnbd/rnbd-clt-sysfs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/block/rnbd/rnbd-clt-sysfs.c +1 -5
index d4aa6bfc9555..38251b749664 100644
@@ -479,11 +479,7 @@ static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,
 	while ((s = strchr(pathname, '/')))
 		s[0] = '!';
 
-	ret = snprintf(buf, len, "%s", pathname);
-	if (ret >= len)
-		return -ENAMETOOLONG;
-
-	ret = snprintf(buf, len, "%s@%s", buf, dev->sess->sessname);
+	ret = snprintf(buf, len, "%s@%s", pathname, dev->sess->sessname);
 	if (ret >= len)
 		return -ENAMETOOLONG;
 
Signature · 1 line
2.29.2
maintainer
#1 lore raw
Quoted 41 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The -Wrestrict warning (disabled by default) points out undefined behavior calling snprintf():

drivers/block/rnbd/rnbd-clt-sysfs.c: In function 'rnbd_clt_get_path_name':
drivers/block/rnbd/rnbd-clt-sysfs.c:486:8: error: 'snprintf' argument 4 overlaps destination object 'buf' [-Werror=restrict]

  486 |  ret = snprintf(buf, len, "%s@%s", buf, dev->sess->sessname);
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/block/rnbd/rnbd-clt-sysfs.c:472:67: note: destination object referenced by 'restrict'-qualified argument 1 was declared here
472 | static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,
| ~~~~~~^~~

This can be simplified by using a single snprintf() to print the whole buffer, avoiding the undefined behavior.

Fixes 91f4acb2801c ("block/rnbd-clt: support mapping two devices with the same name from different servers")
---
 drivers/block/rnbd/rnbd-clt-sysfs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/block/rnbd/rnbd-clt-sysfs.c +1 -6
index d4aa6bfc9555..38251b749664 100644
@@ -479,11 +479,7 @@ static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,
        while ((s = strchr(pathname, '/')))
                s[0] = '!';
 
-       ret = snprintf(buf, len, "%s", pathname);
-       if (ret >= len)
-               return -ENAMETOOLONG;
-
-       ret = snprintf(buf, len, "%s@%s", buf, dev->sess->sessname);
+       ret = snprintf(buf, len, "%s@%s", pathname, dev->sess->sessname);
        if (ret >= len)
                return -ENAMETOOLONG;
 
--
Quoted 2 lines

2.29.2

Thanks Arnd, We have a same patch will send out soon as part of a bigger patchset.