rpmsg: Replace deprecated strncpy with strscpy_pad
authorJustin Stitt <justinstitt@google.com>
Fri, 20 Oct 2023 23:18:59 +0000 (23:18 +0000)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 23 Oct 2023 17:57:57 +0000 (11:57 -0600)
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
Link: https://github.com/KSPP/linux/issues/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>
drivers/rpmsg/rpmsg_ns.c

index c70ad03ff2e90f7ef350d9ac15238d5eee0e8580..bde8c8d433e0aa68b1c9686f9d6d82df961fd30c 100644 (file)
@@ -50,7 +50,7 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *data, int len,
        /* don't trust the remote processor for null terminating the name */
        msg->name[RPMSG_NAME_SIZE - 1] = '\0';
 
-       strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
+       strscpy_pad(chinfo.name, msg->name, sizeof(chinfo.name));
        chinfo.src = RPMSG_ADDR_ANY;
        chinfo.dst = rpmsg32_to_cpu(rpdev, msg->addr);