Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1856528 authored by Hangyu Hua's avatar Hangyu Hua Committed by Greg Kroah-Hartman
Browse files

media: dvb_vb2: fix possible out of bound access 



commit 37238699073e7e93f05517e529661151173cd458 upstream.

vb2_core_qbuf and vb2_core_querybuf don't check the range of b->index
controlled by the user.

Fix this by adding range checking code before using them.

Fixes: 57868acc ("media: videobuf2: Add new uAPI for DVB streaming I/O")
Signed-off-by: default avatarHangyu Hua <hbh25y@gmail.com>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f4634f7

drivers/media/dvb-core/dvb_vb2.c

+11 −0
Original line number Diff line number Diff line
@@ -358,6 +358,12 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req) 


int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)

{

	struct vb2_queue *q = &ctx->vb_q;



	if (b->index >= q->num_buffers) {

		dprintk(1, "[%s] buffer index out of range\n", ctx->name);

		return -EINVAL;

	}

	vb2_core_querybuf(&ctx->vb_q, b->index, b);

	dprintk(3, "[%s] index=%d\n", ctx->name, b->index);

	return 0;
@@ -382,8 +388,13 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp) 


int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)

{

	struct vb2_queue *q = &ctx->vb_q;

	int ret;



	if (b->index >= q->num_buffers) {

		dprintk(1, "[%s] buffer index out of range\n", ctx->name);

		return -EINVAL;

	}

	ret = vb2_core_qbuf(&ctx->vb_q, b->index, b, NULL);

	if (ret) {

		dprintk(1, "[%s] index=%d errno=%d\n", ctx->name,