| Message ID | 20230309122716.1624141-1-sakari.ailus@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] media: v4l: subdev: Make link validation safer | expand |
Hi Sakari, Thank you for the patch. On Thu, Mar 09, 2023 at 02:27:16PM +0200, Sakari Ailus wrote: > Link validation currently accesses invalid pointers if the link passed to it > is not between two sub-devices. This is of course a driver bug. > > Ignore the error but print a debug message, as this is how it used to work > previously. > > Fixes: a6b995ed03ff ("media: subdev: use streams in v4l2_subdev_link_validate()") > Reported-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Reported-and-tested-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/media/v4l2-core/v4l2-subdev.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index 1bebcda2bd20c..dd911180ec899 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -1209,6 +1209,17 @@ int v4l2_subdev_link_validate(struct media_link *link) > struct v4l2_subdev_state *source_state, *sink_state; > int ret; > > + if (!is_media_entity_v4l2_subdev(link->sink->entity)) { > + pr_warn_once("entity \"%s\" not a V4L2 sub-device, driver bug!\n", > + link->sink->entity->name); Printing the whole link would make it easier to debug the problem: pr_warn_once("sink of link '%s':%u->'%s':%u is not a V4L2 sub-device, driver bug!\n", link->source->entity->name, link->source->index); link->sink->entity->name, link->sink->index); Same below. With this, and the other comments in the mail thread addressed, Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > + return 0; > + } > + if (!is_media_entity_v4l2_subdev(link->source->entity)) { > + pr_warn_once("entity \"%s\" not a V4L2 sub-device, driver bug!\n", > + link->source->entity->name); > + return 0; > + } > + > sink_sd = media_entity_to_v4l2_subdev(link->sink->entity); > source_sd = media_entity_to_v4l2_subdev(link->source->entity); >
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 1bebcda2bd20c..dd911180ec899 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1209,6 +1209,17 @@ int v4l2_subdev_link_validate(struct media_link *link) struct v4l2_subdev_state *source_state, *sink_state; int ret; + if (!is_media_entity_v4l2_subdev(link->sink->entity)) { + pr_warn_once("entity \"%s\" not a V4L2 sub-device, driver bug!\n", + link->sink->entity->name); + return 0; + } + if (!is_media_entity_v4l2_subdev(link->source->entity)) { + pr_warn_once("entity \"%s\" not a V4L2 sub-device, driver bug!\n", + link->source->entity->name); + return 0; + } + sink_sd = media_entity_to_v4l2_subdev(link->sink->entity); source_sd = media_entity_to_v4l2_subdev(link->source->entity);
Link validation currently accesses invalid pointers if the link passed to it is not between two sub-devices. This is of course a driver bug. Ignore the error but print a debug message, as this is how it used to work previously. Fixes: a6b995ed03ff ("media: subdev: use streams in v4l2_subdev_link_validate()") Reported-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reported-and-tested-by: Hans de Goede <hdegoede@redhat.com> --- drivers/media/v4l2-core/v4l2-subdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+)