]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: mc: Fix graph walk in media_pipeline_start
authorTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Mon, 18 Mar 2024 09:50:59 +0000 (11:50 +0200)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 10 Apr 2024 13:15:31 +0000 (15:15 +0200)
The graph walk tries to follow all links, even if they are not between
pads. This causes a crash with, e.g. a MEDIA_LNK_FL_ANCILLARY_LINK link.

Fix this by allowing the walk to proceed only for MEDIA_LNK_FL_DATA_LINK
links.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: stable@vger.kernel.org # for 6.1 and later
Fixes: ae219872834a ("media: mc: entity: Rewrite media_pipeline_start()")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
drivers/media/mc/mc-entity.c

index 0e28b9a7936ef40287e5a08377d22e5275396642..96dd0f6ccd0d0ae96af84a8620e1ec07945e607d 100644 (file)
@@ -619,6 +619,12 @@ static int media_pipeline_explore_next_link(struct media_pipeline *pipe,
        link = list_entry(entry->links, typeof(*link), list);
        last_link = media_pipeline_walk_pop(walk);
 
+       if ((link->flags & MEDIA_LNK_FL_LINK_TYPE) != MEDIA_LNK_FL_DATA_LINK) {
+               dev_dbg(walk->mdev->dev,
+                       "media pipeline: skipping link (not data-link)\n");
+               return 0;
+       }
+
        dev_dbg(walk->mdev->dev,
                "media pipeline: exploring link '%s':%u -> '%s':%u\n",
                link->source->entity->name, link->source->index,