media: v4l2-subdev: Fail {enable,disable}_streams and s_streaming nicely
PATCH 1/1 media: v4l2-subdev: Fail {enable,disable}_streams and s_streaming nicely
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.
---
since v2:
- Move the check, with checking the pad ops, to
v4l2_subdev_s_stream_helper().
drivers/media/v4l2-core/v4l2-subdev.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/v4l2-core/v4l2-subdev.c +4 -0
@@ -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_ONCE (!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
Signature · 1 line
2.47.3
Quoted 1 line · Sakari Ailus
since v2:
This was indeed meant to be v3.
Signature · 1 line
Sakari Ailus
Quoted 25 lines · Sakari Ailus
If a sub-device does not set
enable_streams()anddisable_streams()pad ops while it sets thes_stream()video op tov4l2_subdev_s_stream_helper(), enabling or disabling streaming either way on the sub-device will result callingv4l2_subdev_s_stream_helper()and v4l2_subdev_{enable,disable}_streams() recursively, exhausting the stack. Return-ENOIOCTLCMDin this case to handle the situation gracefully.Reported-by David Heidelberg <[email protected]>Fixes b62949ddaa52 ("media: subdev: Support single-stream case in v4l2_subdev_enable/disable_streams()")Signed-off-by Sakari Ailus <[email protected]>---
since v2:- Move the check, with checking the pad ops, to
v4l2_subdev_s_stream_helper().drivers/media/v4l2-core/v4l2-subdev.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/media/v4l2-core/v4l2-subdev.c +0
-0
drivers/media/v4l2-core/v4l2-subdev.c int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable) · line 2508
Quoted 5 lines
drivers/media/v4l2-core/v4l2-subdev.c +2
-0@@ -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_ONCE (!v4l2_subdev_has_op (sd, pad, enable_streams) || + !v4l2_subdev_has_op (sd, pad, disable_streams)))
Is this indicates a clear bug, I would use WARN_ON() instead of WARN_ON_ONCE(). Up to you.
Quoted 5 lines
drivers/media/v4l2-core/v4l2-subdev.c +2
-0+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
Signature · 3 lines
Regards, Laurent Pinchart