summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorXu Panda <xu.panda@zte.com.cn>2022-12-07 04:09:09 +0300
committerMarc Kleine-Budde <mkl@pengutronix.de>2022-12-12 13:41:24 +0300
commit7fdaf8966aae476deafe11f9a0067ff588615444 (patch)
treeaa3c86fdd429af329bdd45d35607084d158644b2 /drivers/net
parent5425094a39caf1cf501a71a0c149604656046acb (diff)
downloadlinux-7fdaf8966aae476deafe11f9a0067ff588615444.tar.xz
can: ucan: use strscpy() to instead of strncpy()
The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings. Signed-off-by: Xu Panda <xu.panda@zte.com.cn> Signed-off-by: Yang Yang <yang.yang29@zte.com> Link: https://lore.kernel.org/all/202212070909095189693@zte.com.cn Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/usb/ucan.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c
index ffa38f533c35..159e25ffa337 100644
--- a/drivers/net/can/usb/ucan.c
+++ b/drivers/net/can/usb/ucan.c
@@ -1534,9 +1534,8 @@ static int ucan_probe(struct usb_interface *intf,
sizeof(union ucan_ctl_payload));
if (ret > 0) {
/* copy string while ensuring zero termination */
- strncpy(firmware_str, up->ctl_msg_buffer->raw,
- sizeof(union ucan_ctl_payload));
- firmware_str[sizeof(union ucan_ctl_payload)] = '\0';
+ strscpy(firmware_str, up->ctl_msg_buffer->raw,
+ sizeof(union ucan_ctl_payload) + 1);
} else {
strcpy(firmware_str, "unknown");
}