]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: v4l2-subdev: Fail {enable,disable}_streams and s_streaming nicely
authorSakari Ailus <sakari.ailus@linux.intel.com>
Sat, 21 Mar 2026 21:41:50 +0000 (23:41 +0200)
committerSakari Ailus <sakari.ailus@linux.intel.com>
Tue, 5 May 2026 07:21:22 +0000 (10:21 +0300)
If a sub-device does not set enable_streams() and disable_streams() pad
ops while it sets the s_stream() video op to
v4l2_subdev_s_stream_helper(), enabling or disabling streaming either way
on the sub-device will result calling v4l2_subdev_s_stream_helper() and
v4l2_subdev_{enable,disable}_streams() recursively, exhausting the stack.
Return -ENOIOCTLCMD in this case to handle the situation gracefully.

Fixes: b62949ddaa52 ("media: subdev: Support single-stream case in v4l2_subdev_enable/disable_streams()")
Cc: stable@vger.kernel.org
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
drivers/media/v4l2-core/v4l2-subdev.c

index 831c69c958b8a186f4dd4cbd337d7957e676c12c..d00d27d49060aa209fbe21eb14b3dbe37ba71625 100644 (file)
@@ -2504,6 +2504,10 @@ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable)
        u64 source_mask = 0;
        int pad_index = -1;
 
+       if (WARN_ON(!v4l2_subdev_has_op(sd, pad, enable_streams) ||
+                   !v4l2_subdev_has_op(sd, pad, disable_streams)))
+               return -ENOIOCTLCMD;
+
        /*
         * Find the source pad. This helper is meant for subdevs that have a
         * single source pad, so failures shouldn't happen, but catch them