Skip to content

Commit ec189da

Browse files
JustinStittmathieupoirier
authored andcommitted
rpmsg: Replace deprecated strncpy with strscpy_pad
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 use with format strings: | dev_err(&ctrldev->dev, "failed to create %s channel\n", chinfo.name); Since chinfo is not default initialized, we should NUL-pad the `name` field so that the behavior is consistent with what strncpy() provides: | struct rpmsg_channel_info chinfo; Considering the above, a suitable replacement is `strscpy_pad` due to the fact that it guarantees both NUL-termination and NUL-padding on the destination buffer. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: KSPP#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_ns-c-v1-1-99b16b00c36c@google.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent a9580b9 commit ec189da

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/rpmsg/rpmsg_ns.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
5050
/* don't trust the remote processor for null terminating the name */
5151
msg->name[RPMSG_NAME_SIZE - 1] = '\0';
5252

53-
strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
53+
strscpy_pad(chinfo.name, msg->name, sizeof(chinfo.name));
5454
chinfo.src = RPMSG_ADDR_ANY;
5555
chinfo.dst = rpmsg32_to_cpu(rpdev, msg->addr);
5656

0 commit comments

Comments
 (0)