c2port: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Wed, 27 Sep 2023 05:20:58 +0000 (05:20 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Oct 2023 11:34:05 +0000 (13:34 +0200)
`strncpy` is deprecated for use on NUL-terminated destination strings
[1] and as such we should prefer more robust and less ambiguous string
interfaces.

We expect `c2dev->name` to be NUL-terminated based on its usage with
format strings:
|       dev_info(c2dev->dev, "C2 port %s removed\n", c2dev->name);

Moreover, NUL-padding is _not_ required as c2dev is zero-allocated:
|       c2dev = kzalloc(sizeof(struct c2port_device), GFP_KERNEL);

Considering the above, a suitable replacement is `strscpy` [2] due to
the fact that it guarantees NUL-termination on the destination buffer
without unnecessarily NUL-padding.

Let's also drop `C2PORT_NAME_LEN - 1` for `sizeof(dest)` which is more
idiomatic strscpy usage.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
Link: https://github.com/KSPP/linux/issues/90
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230927-strncpy-drivers-misc-c2port-core-c-v1-1-978f6d220a54@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/c2port/core.c

index f574c83b82cf07d85fe4f22fc8bf52a6df69b87b..2bb1dd2511f9dd178b8c06baa460bb609f7f8fd7 100644 (file)
@@ -923,7 +923,7 @@ struct c2port_device *c2port_device_register(char *name,
        }
        dev_set_drvdata(c2dev->dev, c2dev);
 
-       strncpy(c2dev->name, name, C2PORT_NAME_LEN - 1);
+       strscpy(c2dev->name, name, sizeof(c2dev->name));
        c2dev->ops = ops;
        mutex_init(&c2dev->mutex);