]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
can: peak_pci: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Thu, 5 Oct 2023 00:05:35 +0000 (00:05 +0000)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 5 Oct 2023 07:51:18 +0000 (09:51 +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.

NUL-padding is not required since card is already zero-initialized:
|       card = kzalloc(sizeof(*card), GFP_KERNEL);

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

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: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/all/20231005-strncpy-drivers-net-can-sja1000-peak_pci-c-v1-1-c36e1702cd56@google.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/sja1000/peak_pci.c

index 84f34020aafb9ca1dcc1214e0cd615e6d1f904ab..da396d641e2406cc91acf8a4d108b05d7af6800d 100644 (file)
@@ -462,7 +462,7 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)
                card->led_chip.owner = THIS_MODULE;
                card->led_chip.dev.parent = &pdev->dev;
                card->led_chip.algo_data = &card->i2c_bit;
-               strncpy(card->led_chip.name, "peak_i2c",
+               strscpy(card->led_chip.name, "peak_i2c",
                        sizeof(card->led_chip.name));
 
                card->i2c_bit = peak_pciec_i2c_bit_ops;