| Message ID | 20230919121728.126781-13-sakari.ailus@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Small fixes and cleanups (ov2740 and ccs) | expand |
Hi Sakari, Thank you for the patch. On Tue, Sep 19, 2023 at 03:17:28PM +0300, Sakari Ailus wrote: > Check the validity of pad flags on entity init. Exactly one of the flags > must be set. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > --- > drivers/media/mc/mc-entity.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > index 83468d4a440b..0a54cf8bcca2 100644 > --- a/drivers/media/mc/mc-entity.c > +++ b/drivers/media/mc/mc-entity.c > @@ -197,6 +197,7 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads, > struct media_device *mdev = entity->graph_obj.mdev; > struct media_pad *iter; > unsigned int i = 0; > + int ret = 0; > > if (num_pads >= MEDIA_ENTITY_MAX_PADS) > return -E2BIG; > @@ -210,15 +211,26 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads, > media_entity_for_each_pad(entity, iter) { > iter->entity = entity; > iter->index = i++; > + > + if (hweight32(iter->flags & (MEDIA_PAD_FL_SINK | > + MEDIA_PAD_FL_SOURCE)) != 1) { > + ret = -EINVAL; > + break; > + } > + > if (mdev) > media_gobj_create(mdev, MEDIA_GRAPH_PAD, > &iter->graph_obj); > } > > + if (ret && mdev) > + media_entity_for_each_pad(entity, iter) > + media_gobj_destroy(&iter->graph_obj); With curly braces for the if () { ... }, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + > if (mdev) > mutex_unlock(&mdev->graph_mutex); > > - return 0; > + return ret; > } > EXPORT_SYMBOL_GPL(media_entity_pads_init); >
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c index 83468d4a440b..0a54cf8bcca2 100644 --- a/drivers/media/mc/mc-entity.c +++ b/drivers/media/mc/mc-entity.c @@ -197,6 +197,7 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads, struct media_device *mdev = entity->graph_obj.mdev; struct media_pad *iter; unsigned int i = 0; + int ret = 0; if (num_pads >= MEDIA_ENTITY_MAX_PADS) return -E2BIG; @@ -210,15 +211,26 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads, media_entity_for_each_pad(entity, iter) { iter->entity = entity; iter->index = i++; + + if (hweight32(iter->flags & (MEDIA_PAD_FL_SINK | + MEDIA_PAD_FL_SOURCE)) != 1) { + ret = -EINVAL; + break; + } + if (mdev) media_gobj_create(mdev, MEDIA_GRAPH_PAD, &iter->graph_obj); } + if (ret && mdev) + media_entity_for_each_pad(entity, iter) + media_gobj_destroy(&iter->graph_obj); + if (mdev) mutex_unlock(&mdev->graph_mutex); - return 0; + return ret; } EXPORT_SYMBOL_GPL(media_entity_pads_init);
Check the validity of pad flags on entity init. Exactly one of the flags must be set. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/mc/mc-entity.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)