Skip to contentSkip to conversation

v4l: subdev: Check for pads in [gs]_frame_interval

PATCH In review Sakari Ailus 2 participants 2 messages Oct 17, 2013 – Nov 1, 2013 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l: subdev: Check for pads in [gs]_frame_interval

The validity of the pad field in struct v4l2_subdev_frame_interval was not ensured by the V4L2 subdev IOCTL helper. Fix this.

---
 drivers/media/v4l2-core/v4l2-subdev.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +14 -2
index 996c248..3fa1907 100644
@@ -305,11 +305,23 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 					fse);
 	}
 
-	case VIDIOC_SUBDEV_G_FRAME_INTERVAL:
+	case VIDIOC_SUBDEV_G_FRAME_INTERVAL: {
+		struct v4l2_subdev_frame_interval *fi = arg;
+
+		if (fi->pad >= sd->entity.num_pads)
+			return -EINVAL;
+
 		return v4l2_subdev_call(sd, video, g_frame_interval, arg);
+	}
+
+	case VIDIOC_SUBDEV_S_FRAME_INTERVAL: {
+		struct v4l2_subdev_frame_interval *fi = arg;
+
+		if (fi->pad >= sd->entity.num_pads)
+			return -EINVAL;
 
-	case VIDIOC_SUBDEV_S_FRAME_INTERVAL:
 		return v4l2_subdev_call(sd, video, s_frame_interval, arg);
+	}
 
 	case VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: {
 		struct v4l2_subdev_frame_interval_enum *fie = arg;
Signature · 1 line
1.8.3.2
Acked-by on v1 1/1
#1 lore raw

Hi Sakari,

Quoted 4 lines · Sakari Ailus

The validity of the pad field in struct v4l2_subdev_frame_interval was not ensured by the V4L2 subdev IOCTL helper. Fix this.

Regards,
Sylwester

Quoted 34 lines
---
  drivers/media/v4l2-core/v4l2-subdev.c | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +14 -2
index 996c248..3fa1907 100644
@@ -305,11 +305,23 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
  					fse);
  	}
 
-	case VIDIOC_SUBDEV_G_FRAME_INTERVAL:
+	case VIDIOC_SUBDEV_G_FRAME_INTERVAL: {
+		struct v4l2_subdev_frame_interval *fi = arg;
+
+		if (fi->pad>= sd->entity.num_pads)
+			return -EINVAL;
+
  		return v4l2_subdev_call(sd, video, g_frame_interval, arg);
+	}
+
+	case VIDIOC_SUBDEV_S_FRAME_INTERVAL: {
+		struct v4l2_subdev_frame_interval *fi = arg;
+
+		if (fi->pad>= sd->entity.num_pads)
+			return -EINVAL;
 
-	case VIDIOC_SUBDEV_S_FRAME_INTERVAL:
  		return v4l2_subdev_call(sd, video, s_frame_interval, arg);
+	}
 
  	case VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: {
  		struct v4l2_subdev_frame_interval_enum *fie = arg;