Skip to content

Commit c87271e

Browse files
committed
Merge tag 'rpmsg-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson: "This replaces a number of strncpy() instances with strscpy() or strscpy_pad() through the rpmsg core and virtio implementation" * tag 'rpmsg-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: rpmsg: virtio: Replace deprecated strncpy with strscpy/_pad rpmsg: Replace deprecated strncpy with strscpy_pad rpmsg: core: Replace deprecated strncpy with strscpy
2 parents d3fbdb8 + 2a6e483 commit c87271e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

drivers/rpmsg/rpmsg_core.c

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

547547
if (rpdrv->callback) {
548-
strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE);
548+
strscpy(chinfo.name, rpdev->id.name, sizeof(chinfo.name));
549549
chinfo.src = rpdev->src;
550550
chinfo.dst = RPMSG_ADDR_ANY;
551551

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

drivers/rpmsg/virtio_rpmsg_bus.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)
329329
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
330330
struct rpmsg_ns_msg nsm;
331331

332-
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
332+
strscpy_pad(nsm.name, rpdev->id.name, sizeof(nsm.name));
333333
nsm.addr = cpu_to_rpmsg32(rpdev, rpdev->ept->addr);
334334
nsm.flags = cpu_to_rpmsg32(rpdev, RPMSG_NS_CREATE);
335335

@@ -353,7 +353,7 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)
353353
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
354354
struct rpmsg_ns_msg nsm;
355355

356-
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
356+
strscpy_pad(nsm.name, rpdev->id.name, sizeof(nsm.name));
357357
nsm.addr = cpu_to_rpmsg32(rpdev, rpdev->ept->addr);
358358
nsm.flags = cpu_to_rpmsg32(rpdev, RPMSG_NS_DESTROY);
359359

@@ -424,7 +424,7 @@ static struct rpmsg_device *__rpmsg_create_channel(struct virtproc_info *vrp,
424424
*/
425425
rpdev->announce = rpdev->src != RPMSG_ADDR_ANY;
426426

427-
strncpy(rpdev->id.name, chinfo->name, RPMSG_NAME_SIZE);
427+
strscpy(rpdev->id.name, chinfo->name, sizeof(rpdev->id.name));
428428

429429
rpdev->dev.parent = &vrp->vdev->dev;
430430
rpdev->dev.release = virtio_rpmsg_release_device;

0 commit comments

Comments
 (0)