vb2: Check if there are buffers before streamon
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Wed, 8 Jan 2014 08:01:33 +0000 (05:01 -0300)
committerSimon Horman <horms@verge.net.au>
Fri, 5 Dec 2014 00:24:10 +0000 (09:24 +0900)
This patch adds a test preventing streamon() if there is no buffer
ready.

Without this patch, a user could call streamon() before
preparing any buffer. This leads to a situation where if he calls
close() before calling streamoff() the device is kept streaming.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
(cherry picked from commit 249f5a58bc844506fef2e9d5d55a88fbc708c5fa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/media/v4l2-core/videobuf2-core.c

index 06faea4..6f92c8c 100644 (file)
@@ -1784,6 +1784,11 @@ static int vb2_internal_streamon(struct vb2_queue *q, enum v4l2_buf_type type)
                return -EINVAL;
        }
 
+       if (!q->num_buffers) {
+               dprintk(1, "streamon: no buffers have been allocated\n");
+               return -EINVAL;
+       }
+
        /*
         * If any buffers were queued before streamon,
         * we can now pass them to driver for processing.