[git:media_tree/fixes] media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: 2021-01-12 14:50:38
Subsystem:
media input infrastructure (v4l/dvb), the rest, videobuf2 framework · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds, Tomasz Figa, Marek Szyprowski
This is an automatic generated email to let you know that the following patch were queued:
Subject: media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
Author: Naushir Patuck [off-list ref]
Date: Wed Jan 6 16:16:57 2021 +0100
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 <redacted>
Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <redacted>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 96d3b2b2aa31..3f61f5863bf7 100644
--- 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)