From: Hans Verkuil Date: Wed, 23 May 2018 12:09:23 +0000 (-0400) Subject: media: videobuf2-v4l2: refuse qbuf if queue uses requests or vv. X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ac8090fda77f072815c209c80fb230e89cda18c;p=linux.git media: videobuf2-v4l2: refuse qbuf if queue uses requests or vv. Check if the vb2 queue uses requests, and if so refuse to add buffers that are not part of a request. Also check for the reverse: a vb2 queue did not use requests, and an attempt was made to queue a buffer to a request. We might relax this in the future, but for now just return -EPERM in that case. Signed-off-by: Hans Verkuil Reviewed-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 364b1fea38268..a70df16d68f12 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -378,8 +378,16 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md return ret; } - if (!(b->flags & V4L2_BUF_FLAG_REQUEST_FD)) + if (!(b->flags & V4L2_BUF_FLAG_REQUEST_FD)) { + if (q->uses_requests) { + dprintk(1, "%s: queue uses requests\n", opname); + return -EPERM; + } return 0; + } else if (q->uses_qbuf) { + dprintk(1, "%s: queue does not use requests\n", opname); + return -EPERM; + } /* * For proper locking when queueing a request you need to be able