rpmsg: core: Replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Fri, 20 Oct 2023 19:56:59 +0000 (19:56 +0000)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 23 Oct 2023 17:57:05 +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 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
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
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_core-c-v1-1-a86b7930c1cf@google.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/rpmsg/rpmsg_core.c

index 32b550c91d9f1c7f1918774181654bcf3404407a..8abc7d022ff71ab7ea6f54eff5c712b89382cf38 100644 (file)
@@ -545,7 +545,7 @@ static int rpmsg_dev_probe(struct device *dev)
                goto out;
 
        if (rpdrv->callback) {
-               strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE);
+               strscpy(chinfo.name, rpdev->id.name, sizeof(chinfo.name));
                chinfo.src = rpdev->src;
                chinfo.dst = RPMSG_ADDR_ANY;