diff options
| author | Justin Stitt <justinstitt@google.com> | 2023-09-27 05:20:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-05 13:34:05 +0200 |
| commit | 1b6f457b835447a787a729dbd421653f865921d0 (patch) | |
| tree | 284736fe09adb756d3c3ba98a2800ca6466b3efb | |
| parent | 6f17027cc48793b9e6631fe0e52fee1af0e8b7e0 (diff) | |
| download | linux-stable-1b6f457b835447a787a729dbd421653f865921d0.tar.gz linux-stable-1b6f457b835447a787a729dbd421653f865921d0.tar.bz2 linux-stable-1b6f457b835447a787a729dbd421653f865921d0.zip | |
c2port: replace deprecated strncpy with strscpy
`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 [1]
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2]
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>
| -rw-r--r-- | drivers/misc/c2port/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c index f574c83b82cf..2bb1dd2511f9 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c @@ -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); |