]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: v4l2-subdev: Fix error check in v4l2_subdev_get_frame_desc_passthrough()
authorChen Ni <nichen@iscas.ac.cn>
Tue, 17 Mar 2026 07:20:20 +0000 (15:20 +0800)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Tue, 24 Mar 2026 10:58:02 +0000 (11:58 +0100)
Use IS_ERR() and PTR_ERR() to properly handle the error return from
media_pad_remote_pad_unique(), which returns ERR_PTR() on failure but
never NULL. The previous code only checked for NULL, leading to invalid
pointer dereference.

Detected by Smatch:
drivers/media/v4l2-core/v4l2-subdev.c:2588 v4l2_subdev_get_frame_desc_passthrough() warn:
'remote_source_pad' is an error pointer or valid

drivers/media/v4l2-core/v4l2-subdev.c:2595 v4l2_subdev_get_frame_desc_passthrough() error:
'remote_source_pad' dereferencing possible ERR_PTR()

Fixes: a564839e630c ("media: subdev: Add v4l2_subdev_get_frame_desc_passthrough helper")
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/v4l2-core/v4l2-subdev.c

index 9efd14d4026f22ab743a1a5719e6c87e9ef81860..7cb17e0a561709d70104f6d1e24ddb8f325e941e 100644 (file)
@@ -2585,10 +2585,10 @@ int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd,
 
                        if (!have_source_fd) {
                                remote_source_pad = media_pad_remote_pad_unique(local_sink_pad);
-                               if (!remote_source_pad) {
+                               if (IS_ERR(remote_source_pad)) {
                                        dev_dbg(dev, "Failed to find remote pad for sink pad %u\n",
                                                local_sink_pad->index);
-                                       ret = -EINVAL;
+                                       ret = PTR_ERR(remote_source_pad);
                                        goto out_unlock;
                                }