Browse Source

[media] vivid: sanitize selection rectangle

Handle values like ~0 as width, height, left or top fields.
Just strip off the top 16 bits will ensure that the calculations
remain OK.

Found with v4l2-compliance.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Hans Verkuil 10 năm trước cách đây
mục cha
commit
82bdb26abc

+ 6 - 2
drivers/media/platform/vivid/vivid-vid-common.c

@@ -694,6 +694,9 @@ int vivid_vid_adjust_sel(unsigned flags, struct v4l2_rect *r)
 	unsigned w = r->width;
 	unsigned w = r->width;
 	unsigned h = r->height;
 	unsigned h = r->height;
 
 
+	/* sanitize w and h in case someone passes ~0 as the value */
+	w &= 0xffff;
+	h &= 0xffff;
 	if (!(flags & V4L2_SEL_FLAG_LE)) {
 	if (!(flags & V4L2_SEL_FLAG_LE)) {
 		w++;
 		w++;
 		h++;
 		h++;
@@ -718,8 +721,9 @@ int vivid_vid_adjust_sel(unsigned flags, struct v4l2_rect *r)
 		r->top = 0;
 		r->top = 0;
 	if (r->left < 0)
 	if (r->left < 0)
 		r->left = 0;
 		r->left = 0;
-	r->left &= ~1;
-	r->top &= ~1;
+	/* sanitize left and top in case someone passes ~0 as the value */
+	r->left &= 0xfffe;
+	r->top &= 0xfffe;
 	if (r->left + w > MAX_WIDTH)
 	if (r->left + w > MAX_WIDTH)
 		r->left = MAX_WIDTH - w;
 		r->left = MAX_WIDTH - w;
 	if (r->top + h > MAX_HEIGHT)
 	if (r->top + h > MAX_HEIGHT)