iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpmsg updates for v6.7

Browse Source 
This replaces a number of strncpy() instances with strscpy()
 strscpy_pad() through the rpmsg core and virtio implementation.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmVJqrMVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FY8YP/RsG/00MZdHEIxBO9HrrdMxAtwC5
 4xy0oVq2RJ3J7sOzCLyotFZwt/WOe/5ua+XbCgujvy2wEutdQH+QnnIjVGFZoBao
 QmRiGJe8lNodBE/fcoHE/yPMk7nlQM24E34llN2dth1B1ffjXgZHbbraTrgKtkyl
 gVazDGNdhJ51C1Q2P2KqZKC+RAEztpZtfIS6Y9NulNwWD9dxLJR2oBwjqeILHGkY
 ZIq0eysemxxCmRHz4elQFnN8EHgDw1Iv332pxSp6KbuuBthaqzWPmGDKTWizwukZ
 5cybRdarZ7vU3MfdjX2sIVEVQlYGAC9iDC9NF2wDSvq61aBQJDUXJ2+ObtD6KAru
 6W2TjdTlzKC8VPfNO20Xn1fCQScyXtMmwhwUbN2EfWJhg3WSi0W0tDkiwU0QAr4a
 0YcYc+CcXMs6yx3IwIzTke7InMy1a4Y/TTtenCSyigpOdrXotZaXNYBt6yjwguE0
 Hkd9U0z82I/VkSGvSHVz2rbivXcoOzBytEmzBHMjR6g89vJs3O1Ux1hBO2prDSIa
 LS8TobTfUxjBCYH6X33VYFLJR0li00/guMoNjP8QiMqw7vyhIhj0Fgs6a3ZhHvge
 Kf0scNLmSt803/FuQ906OMXNa75devejV26l8A8JBoWCtwGdlVnhDutkPirNrT/D
 UqPIlge4hMOHO57q
 =i2b6
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-11-07 16:50:51 -08:00
commit c87271ee86
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/rpmsg/rpmsg_core.c
View 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;

2
drivers/rpmsg/rpmsg_ns.c
View 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);

6
drivers/rpmsg/virtio_rpmsg_bus.c
View File

@ -329,7 +329,7 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
struct rpmsg_ns_msg nsm;
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
strscpy_pad(nsm.name, rpdev->id.name, sizeof(nsm.name));
nsm.addr = cpu_to_rpmsg32(rpdev, rpdev->ept->addr);
nsm.flags = cpu_to_rpmsg32(rpdev, RPMSG_NS_CREATE);
@ -353,7 +353,7 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
struct rpmsg_ns_msg nsm;
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
strscpy_pad(nsm.name, rpdev->id.name, sizeof(nsm.name));
nsm.addr = cpu_to_rpmsg32(rpdev, rpdev->ept->addr);
nsm.flags = cpu_to_rpmsg32(rpdev, RPMSG_NS_DESTROY);
@ -424,7 +424,7 @@ static struct rpmsg_device *__rpmsg_create_channel(struct virtproc_info *vrp,
*/
rpdev->announce = rpdev->src != RPMSG_ADDR_ANY;
strncpy(rpdev->id.name, chinfo->name, RPMSG_NAME_SIZE);
strscpy(rpdev->id.name, chinfo->name, sizeof(rpdev->id.name));
rpdev->dev.parent = &vrp->vdev->dev;
rpdev->dev.release = virtio_rpmsg_release_device;