On 03/11/14 11:57, Laurent Pinchart wrote:
> Hi Hans,
>
> On Tuesday 11 March 2014 11:45:09 Hans Verkuil wrote:
>> On 03/11/14 00:15, Laurent Pinchart wrote:
>>> 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@xxxxxxxxxxxxxxxx>
>>> ---
>>>
>>> drivers/media/i2c/ad9389b.c | 2 --
>>> drivers/media/i2c/adv7511.c | 2 --
>>> drivers/media/i2c/adv7604.c | 4 ----
>>> drivers/media/i2c/adv7842.c | 4 ----
>>> drivers/media/v4l2-core/v4l2-subdev.c | 24 ++++++++++++++++++++----
>>> 5 files changed, 20 insertions(+), 16 deletions(-)
>
> [snip]
>
>>> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c
>>> b/drivers/media/v4l2-core/v4l2-subdev.c index 853fb84..9fff1eb 100644
>>> --- a/drivers/media/v4l2-core/v4l2-subdev.c
>>> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
>>> @@ -349,11 +349,27 @@ static long subdev_do_ioctl(struct file *file,
>>> unsigned int cmd, void *arg)>
>>> sd, pad, set_selection, subdev_fh, sel);
>>> }
>>>
>>> - case VIDIOC_SUBDEV_G_EDID:
>>> - return v4l2_subdev_call(sd, pad, get_edid, arg);
>>> + case VIDIOC_SUBDEV_G_EDID: {
>>> + struct v4l2_subdev_edid *edid = arg;
>>>
>>> - case VIDIOC_SUBDEV_S_EDID:
>>> - return v4l2_subdev_call(sd, pad, set_edid, arg);
>>> + if (edid->pad >= sd->entity.num_pads)
>>> + return -EINVAL;
>>> + if (edid->edid == NULL)
>>> + return -EINVAL;
>>> +
>>> + return v4l2_subdev_call(sd, pad, get_edid, edid);
>>> + }
>>> +
>>> + case VIDIOC_SUBDEV_S_EDID: {
>>> + struct v4l2_subdev_edid *edid = arg;
>>> +
>>> + if (edid->pad >= sd->entity.num_pads)
>>> + return -EINVAL;
>>> + if (edid->edid == NULL)
>>> + return -EINVAL;
>>
>> If edid->blocks == 0, then edid->edid may be NULL. So this should
>> read:
>>
>> if (edid->blocks && edid->edid == NULL)
>
> OK, I'll fix that.
>
>> This is true for both G and S_EDID ioctls.
>
> What's the point of G_EDID with blocks == 0 ? Testing whether the ioctl is
> supported ?
Now that you mention it, yes, that would be a good use :-)
But I was thinking that you can call it once with blocks == 0, then the
driver will fill in the real number of blocks and you can use that to
size the edid array correctly.
Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
