Browse Source

[media] vb2: Check if there are buffers before streamon

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>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Ricardo Ribalda 11 years ago
parent
commit
548df7831a
1 changed files with 5 additions and 0 deletions
  1. 5 0
      drivers/media/v4l2-core/videobuf2-core.c

+ 5 - 0
drivers/media/v4l2-core/videobuf2-core.c

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