lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] gspca: s/strncpy/strlcpy/

Browse Source 
Just like in userspace strncpy does not guarantee 0 termination. Use strlcpy
instead which does guarantee 0 termination.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans de Goede
2011-06-05 14:58:46 -03:00
committed by Mauro Carvalho Chehab
parent 2f2ea0f3f2
commit e7d712cc99
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/gspca/gspca.c
View File

@@ -1281,10 +1281,10 @@ static int vidioc_querycap(struct file *file, void *priv,
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
strncpy((char *) cap->driver, gspca_dev->sd_desc->name, strlcpy((char *) cap->driver, gspca_dev->sd_desc->name,
sizeof cap->driver); sizeof cap->driver);
if (gspca_dev->dev->product != NULL) { if (gspca_dev->dev->product != NULL) {
strncpy((char *) cap->card, gspca_dev->dev->product, strlcpy((char *) cap->card, gspca_dev->dev->product,
sizeof cap->card); sizeof cap->card);
} else { } else {
snprintf((char *) cap->card, sizeof cap->card, snprintf((char *) cap->card, sizeof cap->card,
@@ -1462,7 +1462,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
input->type = V4L2_INPUT_TYPE_CAMERA; input->type = V4L2_INPUT_TYPE_CAMERA;
input->status = gspca_dev->cam.input_flags; input->status = gspca_dev->cam.input_flags;
strncpy(input->name, gspca_dev->sd_desc->name, strlcpy(input->name, gspca_dev->sd_desc->name,
sizeof input->name); sizeof input->name);
return 0; return 0;
} }

2
drivers/media/video/gspca/t613.c
View File

@@ -1387,7 +1387,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
return 0; return 0;
case V4L2_CID_EFFECTS: case V4L2_CID_EFFECTS:
if ((unsigned) menu->index < ARRAY_SIZE(effects_control)) { if ((unsigned) menu->index < ARRAY_SIZE(effects_control)) {
strncpy((char *) menu->name, strlcpy((char *) menu->name,
effects_control[menu->index], effects_control[menu->index],
sizeof menu->name); sizeof menu->name);
return 0; return 0;