From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon, 8 Apr 2019 12:32:55 +0000 (-0400)
Subject: media: coda: throw error on create_bufs with too small size
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0eecc61947ed329659a9fa9ef7d0959b1c84259d;p=linux.git

media: coda: throw error on create_bufs with too small size

If VIDIOC_CREATE_BUFS is called with a sizeimage smaller than the
queue sizeimage, fail with -EINVAL instead of correcting the size
and continuing without error. This is required by v4l2-compliance.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index a89d92f5539f2..3ce58dee4422b 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1501,6 +1501,9 @@ static int coda_queue_setup(struct vb2_queue *vq,
 	q_data = get_q_data(ctx, vq->type);
 	size = q_data->sizeimage;
 
+	if (*nplanes)
+		return sizes[0] < size ? -EINVAL : 0;
+
 	*nplanes = 1;
 	sizes[0] = size;