net: mdio-gpio: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Mon, 11 Dec 2023 19:10:00 +0000 (19:10 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 13 Dec 2023 00:00:02 +0000 (16:00 -0800)
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 new_bus->id to be NUL-terminated but not NUL-padded based on
its prior assignment through snprintf:
|       snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);

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

We can also use sizeof() instead of a length macro as this more closely
ties the maximum buffer size to the destination buffer. Do this for two
instances.

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
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20231211-strncpy-drivers-net-mdio-mdio-gpio-c-v3-1-76dea53a1a52@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/mdio/mdio-gpio.c

index 897b88c50bbb3bd0e873526a2752ca0afd0c2615..778db310a28d357dfdee2a53cef45dd2ad438a28 100644 (file)
@@ -123,9 +123,9 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
        new_bus->parent = dev;
 
        if (bus_id != -1)
-               snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);
+               snprintf(new_bus->id, sizeof(new_bus->id), "gpio-%x", bus_id);
        else
-               strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE);
+               strscpy(new_bus->id, "gpio", sizeof(new_bus->id));
 
        if (pdata) {
                new_bus->phy_mask = pdata->phy_mask;