Skip to content

Commit 3e846f1

Browse files
committed
rpmsg: core: Replace deprecated strncpy with strscpy
JIRA: https://issues.redhat.com/browse/RHEL-78824 commit a9580b9 Author: Justin Stitt <justinstitt@google.com> Date: Fri Oct 20 19:56:59 2023 +0000 rpmsg: core: Replace deprecated strncpy with strscpy 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 chinfo.name to be NUL-terminated based on its usage with strncmp(): rpmsg_core.c: 389: if (strncmp(chinfo->name, rpdev->id.name, RPMSG_NAME_SIZE)) Moreover, NUL-padding is not required as chinfo has stack default initialized all fields to zero: rpmsg_core.c: 539: struct rpmsg_channel_info chinfo = {}; Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Also, favor the more idiomatic strscpy() usage of: (dest, src, sizeof(dest)). 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/linux#90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt <justinstitt@google.com> Link: https://lore.kernel.org/r/20231020-strncpy-drivers-rpmsg-rpmsg_core-c-v1-1-a86b7930c1cf@google.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Jared Kangas <jkangas@redhat.com>
1 parent 4d15242 commit 3e846f1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/rpmsg/rpmsg_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ static int rpmsg_dev_probe(struct device *dev)
526526
goto out;
527527

528528
if (rpdrv->callback) {
529-
strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE);
529+
strscpy(chinfo.name, rpdev->id.name, sizeof(chinfo.name));
530530
chinfo.src = rpdev->src;
531531
chinfo.dst = RPMSG_ADDR_ANY;
532532

0 commit comments

Comments
 (0)