]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
iio:imu: adis16480: show_firmware() buffer too small
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 27 Nov 2012 07:31:00 +0000 (07:31 +0000)
committerJonathan Cameron <jic23@kernel.org>
Fri, 30 Nov 2012 13:10:16 +0000 (13:10 +0000)
Smatch complains that snprintf() returns the number of characters,
not counting the NUL terminator, which *would* have been printed if
there were enough space.  In other words the return value could be more
than sizeof(buf).

In this case, we are printing something like "ff.ff\n" which is at most
6 characters and a NUL so that's not an issue.  I changed snprintf() to
scnprintf() to silence the warning.

But since the buffer doesn't include space for the NUL terminator, we
need to make it bigger or the "\n" will be truncated off.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-By: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/imu/adis16480.c

index a080b35150159dfccad02c3114bfa7743bad5c5f..150d7faa9275850ec767eb8bf1720c1eb7160c21 100644 (file)
@@ -125,7 +125,7 @@ static ssize_t adis16480_show_firmware_revision(struct file *file,
                char __user *userbuf, size_t count, loff_t *ppos)
 {
        struct adis16480 *adis16480 = file->private_data;
-       char buf[6];
+       char buf[7];
        size_t len;
        u16 rev;
        int ret;
@@ -134,7 +134,7 @@ static ssize_t adis16480_show_firmware_revision(struct file *file,
        if (ret < 0)
                return ret;
 
-       len = snprintf(buf, sizeof(buf), "%x.%x\n", rev >> 8, rev & 0xff);
+       len = scnprintf(buf, sizeof(buf), "%x.%x\n", rev >> 8, rev & 0xff);
 
        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
 }