Skip to content

Commit e2def33

Browse files
JustinStittwsakernel
authored andcommitted
i2c: cp2615: replace deprecated strncpy with strscpy
`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 [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: KSPP#90 Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent 0c051c8 commit e2def33

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/i2c/busses/i2c-cp2615.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ cp2615_i2c_probe(struct usb_interface *usbif, const struct usb_device_id *id)
298298
if (!adap)
299299
return -ENOMEM;
300300

301-
strncpy(adap->name, usbdev->serial, sizeof(adap->name) - 1);
301+
strscpy(adap->name, usbdev->serial, sizeof(adap->name));
302302
adap->owner = THIS_MODULE;
303303
adap->dev.parent = &usbif->dev;
304304
adap->dev.of_node = usbif->dev.of_node;

0 commit comments

Comments
 (0)