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>
This commit is contained in:
@@ -1064,8 +1064,8 @@ static int cio2_v4l2_querycap(struct file *file, void *fh,
|
||||
{
|
||||
struct cio2_device *cio2 = video_drvdata(file);
|
||||
|
||||
strlcpy(cap->driver, CIO2_NAME, sizeof(cap->driver));
|
||||
strlcpy(cap->card, CIO2_DEVICE_NAME, sizeof(cap->card));
|
||||
strscpy(cap->driver, CIO2_NAME, sizeof(cap->driver));
|
||||
strscpy(cap->card, CIO2_DEVICE_NAME, sizeof(cap->card));
|
||||
snprintf(cap->bus_info, sizeof(cap->bus_info),
|
||||
"PCI:%s", pci_name(cio2->pci_dev));
|
||||
|
||||
@@ -1143,7 +1143,7 @@ cio2_video_enum_input(struct file *file, void *fh, struct v4l2_input *input)
|
||||
if (input->index > 0)
|
||||
return -EINVAL;
|
||||
|
||||
strlcpy(input->name, "camera", sizeof(input->name));
|
||||
strscpy(input->name, "camera", sizeof(input->name));
|
||||
input->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
|
||||
return 0;
|
||||
@@ -1783,7 +1783,7 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
|
||||
mutex_init(&cio2->lock);
|
||||
|
||||
cio2->media_dev.dev = &cio2->pci_dev->dev;
|
||||
strlcpy(cio2->media_dev.model, CIO2_DEVICE_NAME,
|
||||
strscpy(cio2->media_dev.model, CIO2_DEVICE_NAME,
|
||||
sizeof(cio2->media_dev.model));
|
||||
snprintf(cio2->media_dev.bus_info, sizeof(cio2->media_dev.bus_info),
|
||||
"PCI:%s", pci_name(cio2->pci_dev));
|
||||
|
Reference in New Issue
Block a user