iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] v4l: Validate fields in the core code for subdev EDID ioctls

Browse Source 
The subdev EDID ioctls receive a pad field that must reference an
existing pad and an EDID field that must point to a buffer. Validate
both fields in the core code instead of duplicating validation in all
drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart 2014-01-29 10:07:13 -03:00 committed by Mauro Carvalho Chehab
parent 9cfd65e809
commit f2e9084779
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/i2c/ad9389b.c
View File

@ -682,8 +682,6 @@ static int ad9389b_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
return -EINVAL; return -EINVAL;
if (edid->blocks == 0 || edid->blocks > 256) if (edid->blocks == 0 || edid->blocks > 256)
return -EINVAL; return -EINVAL;
if (!edid->edid)
return -EINVAL;
if (!state->edid.segments) { if (!state->edid.segments) {
v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n"); v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n");
return -ENODATA; return -ENODATA;

2
drivers/media/i2c/adv7511.c
View File

@ -783,8 +783,6 @@ static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
return -EINVAL; return -EINVAL;
if ((edid->blocks == 0) || (edid->blocks > 256)) if ((edid->blocks == 0) || (edid->blocks > 256))
return -EINVAL; return -EINVAL;
if (!edid->edid)
return -EINVAL;
if (!state->edid.segments) { if (!state->edid.segments) {
v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n"); v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n");
return -ENODATA; return -ENODATA;

4
drivers/media/i2c/adv7604.c
View File

@ -1673,8 +1673,6 @@ static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
return -EINVAL; return -EINVAL;
if (edid->start_block == 1) if (edid->start_block == 1)
edid->blocks = 1; edid->blocks = 1;
if (!edid->edid)
return -EINVAL;
if (edid->blocks > state->edid.blocks) if (edid->blocks > state->edid.blocks)
edid->blocks = state->edid.blocks; edid->blocks = state->edid.blocks;
@ -1761,8 +1759,6 @@ static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
edid->blocks = 2; edid->blocks = 2;
return -E2BIG; return -E2BIG;
} }
if (!edid->edid)
return -EINVAL;
v4l2_dbg(2, debug, sd, "%s: write EDID pad %d, edid.present = 0x%x\n", v4l2_dbg(2, debug, sd, "%s: write EDID pad %d, edid.present = 0x%x\n",
__func__, edid->pad, state->edid.present); __func__, edid->pad, state->edid.present);

4
drivers/media/i2c/adv7842.c
View File

@ -2036,8 +2036,6 @@ static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
return -EINVAL; return -EINVAL;
if (edid->start_block == 1) if (edid->start_block == 1)
edid->blocks = 1; edid->blocks = 1;
if (!edid->edid)
return -EINVAL;
switch (edid->pad) { switch (edid->pad) {
case ADV7842_EDID_PORT_A: case ADV7842_EDID_PORT_A:
@ -2072,8 +2070,6 @@ static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *e)
return -EINVAL; return -EINVAL;
if (e->blocks > 2) if (e->blocks > 2)
return -E2BIG; return -E2BIG;
if (!e->edid)
return -EINVAL;
/* todo, per edid */ /* todo, per edid */
state->aspect_ratio = v4l2_calc_aspect_ratio(e->edid[0x15], state->aspect_ratio = v4l2_calc_aspect_ratio(e->edid[0x15],

24
drivers/media/v4l2-core/v4l2-subdev.c
View File

@ -361,11 +361,27 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
sd, pad, set_selection, subdev_fh, sel); sd, pad, set_selection, subdev_fh, sel);
} }
case VIDIOC_G_EDID: case VIDIOC_G_EDID: {
return v4l2_subdev_call(sd, pad, get_edid, arg); struct v4l2_subdev_edid *edid = arg;
case VIDIOC_S_EDID: if (edid->pad >= sd->entity.num_pads)
return v4l2_subdev_call(sd, pad, set_edid, arg); return -EINVAL;
if (edid->blocks && edid->edid == NULL)
return -EINVAL;
return v4l2_subdev_call(sd, pad, get_edid, edid);
}
case VIDIOC_S_EDID: {
struct v4l2_subdev_edid *edid = arg;
if (edid->pad >= sd->entity.num_pads)
return -EINVAL;
if (edid->blocks && edid->edid == NULL)
return -EINVAL;
return v4l2_subdev_call(sd, pad, set_edid, edid);
}
case VIDIOC_SUBDEV_DV_TIMINGS_CAP: { case VIDIOC_SUBDEV_DV_TIMINGS_CAP: {
struct v4l2_dv_timings_cap *cap = arg; struct v4l2_dv_timings_cap *cap = arg;