media: use strscpy() instead of strlcpy()

The implementation of strscpy() is more robust and safer.

That's now the recommended way to copy NUL terminated strings.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/usb/pwc/pwc-v4l.c b/drivers/media/usb/pwc/pwc-v4l.c
index 043b2b97cee6..0673238c2c63 100644
--- a/drivers/media/usb/pwc/pwc-v4l.c
+++ b/drivers/media/usb/pwc/pwc-v4l.c
@@ -493,7 +493,7 @@ static int pwc_querycap(struct file *file, void *fh, struct v4l2_capability *cap
         struct pwc_device *pdev = video_drvdata(file);
 
         strcpy(cap->driver, PWC_NAME);
-        strlcpy(cap->card, pdev->vdev.name, sizeof(cap->card));
+        strscpy(cap->card, pdev->vdev.name, sizeof(cap->card));
         usb_make_path(pdev->udev, cap->bus_info, sizeof(cap->bus_info));
         cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
                                         V4L2_CAP_READWRITE;
@@ -506,7 +506,7 @@ static int pwc_enum_input(struct file *file, void *fh, struct v4l2_input *i)
         if (i->index)   /* Only one INPUT is supported */
                 return -EINVAL;
 
-        strlcpy(i->name, "Camera", sizeof(i->name));
+        strscpy(i->name, "Camera", sizeof(i->name));
         i->type = V4L2_INPUT_TYPE_CAMERA;
         return 0;
 }
@@ -889,11 +889,13 @@ static int pwc_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtdesc
                 /* RAW format */
                 f->pixelformat = pdev->type <= 646 ? V4L2_PIX_FMT_PWC1 : V4L2_PIX_FMT_PWC2;
                 f->flags = V4L2_FMT_FLAG_COMPRESSED;
-                strlcpy(f->description, "Raw Philips Webcam", sizeof(f->description));
+                strscpy(f->description, "Raw Philips Webcam",
+                        sizeof(f->description));
                 break;
         case 1:
                 f->pixelformat = V4L2_PIX_FMT_YUV420;
-                strlcpy(f->description, "4:2:0, planar, Y-Cb-Cr", sizeof(f->description));
+                strscpy(f->description, "4:2:0, planar, Y-Cb-Cr",
+                        sizeof(f->description));
                 break;
         default:
                 return -EINVAL;