Skip to content

Commit

Permalink
[media] gspca: s/strncpy/strlcpy/
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 2f2ea0f commit e7d712c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -1281,10 +1281,10 @@ static int vidioc_querycap(struct file *file, void *priv,
ret = -ENODEV;
goto out;
}
strncpy((char *) cap->driver, gspca_dev->sd_desc->name,
strlcpy((char *) cap->driver, gspca_dev->sd_desc->name,
sizeof cap->driver);
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);
} else {
snprintf((char *) cap->card, sizeof cap->card,
Expand Down Expand Up @@ -1462,7 +1462,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
return -EINVAL;
input->type = V4L2_INPUT_TYPE_CAMERA;
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);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/t613.c
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
return 0;
case V4L2_CID_EFFECTS:
if ((unsigned) menu->index < ARRAY_SIZE(effects_control)) {
strncpy((char *) menu->name,
strlcpy((char *) menu->name,
effects_control[menu->index],
sizeof menu->name);
return 0;
Expand Down

0 comments on commit e7d712c

Please sign in to comment.