net: wwan: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Thu, 19 Oct 2023 18:21:22 +0000 (18:21 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 21 Oct 2023 01:15:05 +0000 (18:15 -0700)
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 and sprintf:
rpmsg/rpmsg_char.c
165:            dev_err(dev, "failed to open %s\n", eptdev->chinfo.name);
368:    return sprintf(buf, "%s\n", eptdev->chinfo.name);

... and with strcmp():
|  static struct rpmsg_endpoint *qcom_glink_create_ept(struct rpmsg_device *rpdev,
|       rpmsg_rx_cb_t cb,
|       void *priv,
|       struct rpmsg_channel_info
|   chinfo)
|  ...
|  const char *name = chinfo.name;
|  ...
|   if (!strcmp(channel->name, name))

Since chinfo is initialized as such (just above the strscpy()):

|       struct rpmsg_channel_info chinfo = {
|               .src = rpwwan->rpdev->src,
|               .dst = RPMSG_ADDR_ANY,
|       };

... we know other members are zero-initialized. This means no
NUL-padding is required (as any NUL-byte assignments are redundant).

Considering the above, a suitable replacement is `strscpy` due to the
fact that it guarantees NUL-termination on the destination buffer
without unnecessarily NUL-padding.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20231019-strncpy-drivers-net-wwan-rpmsg_wwan_ctrl-c-v2-1-ecf9b5a39430@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/wwan/rpmsg_wwan_ctrl.c

index 86b60aadfa11335bb0cf3df121549a5a9c296050..26756ff0e44d67aac432aba490511f539ef308b7 100644 (file)
@@ -37,7 +37,7 @@ static int rpmsg_wwan_ctrl_start(struct wwan_port *port)
                .dst = RPMSG_ADDR_ANY,
        };
 
-       strncpy(chinfo.name, rpwwan->rpdev->id.name, RPMSG_NAME_SIZE);
+       strscpy(chinfo.name, rpwwan->rpdev->id.name, sizeof(chinfo.name));
        rpwwan->ept = rpmsg_create_ept(rpwwan->rpdev, rpmsg_wwan_ctrl_callback,
                                       rpwwan, chinfo);
        if (!rpwwan->ept)