media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"

naushir · mchehab · commit 95e9295daa84 · 2021-01-12T15:49:12.000+01:00
The updated length check for dmabuf types broke existing usage in v4l2
userland clients.

Fixes: 961d3b27 ("media: videobuf2: Fix length check for single plane dmabuf queueing")
Cc: stable@vger.kernel.org
Signed-off-by: Naushir Patuck &lt;naush@raspberrypi.com&gt;
Tested-by: Kieran Bingham &lt;kieran.bingham+renesas@ideasonboard.com&gt;
Reviewed-by: Kieran Bingham &lt;kieran.bingham+renesas@ideasonboard.com&gt;
Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 				return -EINVAL;
 		}
 	} else {
-		length = (b->memory == VB2_MEMORY_USERPTR ||
-			  b->memory == VB2_MEMORY_DMABUF)
+		length = (b->memory == VB2_MEMORY_USERPTR)
 			? b->length : vb->planes[0].length;
 
 		if (b->bytesused > length)

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer vb, const struct v4l2_buffer b)`
`118`	`118`	`return -EINVAL;`
`119`	`119`	`}`
`120`	`120`	`} else {`
`121`		`- length = (b->memory == VB2_MEMORY_USERPTR \|\|`
`122`		`- b->memory == VB2_MEMORY_DMABUF)`
	`121`	`+ length = (b->memory == VB2_MEMORY_USERPTR)`
`123`	`122`	`? b->length : vb->planes[0].length;`
`124`	`123`
`125`	`124`	`if (b->bytesused > length)`