i2c: cp2615: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Wed, 20 Sep 2023 08:08:52 +0000 (08:08 +0000)
committerWolfram Sang <wsa@kernel.org>
Fri, 22 Sep 2023 10:10:24 +0000 (12:10 +0200)
`strncpy` is deprecated for use on NUL-terminated destination strings [1].

We should prefer more robust and less ambiguous string interfaces.

We expect name to be NUL-terminated based on its numerous uses with
functions that expect NUL-terminated strings.

For example in i2c-core-base.c +1533:
| dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);

NUL-padding is not required as `adap` is already zero-alloacted with:
| adap = devm_kzalloc(&usbif->dev, sizeof(struct i2c_adapter), GFP_KERNEL);

With the above in mind, 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
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-cp2615.c

index 3ded28632e4c1d52584ff4fc257b614c3c203658..20f8f7c9a8cd45a4095687938d220ea2ed687e1a 100644 (file)
@@ -298,7 +298,7 @@ cp2615_i2c_probe(struct usb_interface *usbif, const struct usb_device_id *id)
        if (!adap)
                return -ENOMEM;
 
-       strncpy(adap->name, usbdev->serial, sizeof(adap->name) - 1);
+       strscpy(adap->name, usbdev->serial, sizeof(adap->name));
        adap->owner = THIS_MODULE;
        adap->dev.parent = &usbif->dev;
        adap->dev.of_node = usbif->dev.of_node;