diff options
author | Hans de Goede <hdegoede@redhat.com> | 2009-06-13 17:56:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 02:11:07 -0400 |
commit | b8bfb5fb348d939a96fc8f71996a2e5e48b4544b (patch) | |
tree | c9e058777f5f0869166eeadd23a9f0baac037d5c /drivers/media/video | |
parent | 14422f9dd8515bfbe6fdbde37eadf59e2980f104 (diff) |
V4L/DVB (12071): gspca: fix NULL pointer deref in query_ctrl
gspca: fix NULL pointer deref in query_ctrl
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index f7e0355ad64..1e89600986c 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
1042 | for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) { | 1042 | for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) { |
1043 | if (gspca_dev->ctrl_dis & (1 << i)) | 1043 | if (gspca_dev->ctrl_dis & (1 << i)) |
1044 | continue; | 1044 | continue; |
1045 | if (ctrls->qctrl.id < id) | 1045 | if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id) |
1046 | continue; | 1046 | continue; |
1047 | if (ctrls != NULL) { | 1047 | if (ctrls && gspca_dev->sd_desc->ctrls[i].qctrl.id |
1048 | if (gspca_dev->sd_desc->ctrls[i].qctrl.id | ||
1049 | > ctrls->qctrl.id) | 1048 | > ctrls->qctrl.id) |
1050 | continue; | 1049 | continue; |
1051 | } | ||
1052 | ctrls = &gspca_dev->sd_desc->ctrls[i]; | 1050 | ctrls = &gspca_dev->sd_desc->ctrls[i]; |
1053 | } | 1051 | } |
1054 | } else { | 1052 | } else { |