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

Commit 1fa2337a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx24116: fix a buffer overflow when checking userspace params 



The maximum size for a DiSEqC command is 6, according to the
userspace API. However, the code allows to write up much more values:
	drivers/media/dvb-frontends/cx24116.c:983 cx24116_send_diseqc_msg() error: buffer overflow 'd->msg' 6 <= 23

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 12f4543f

drivers/media/dvb-frontends/cx24116.c

+4 −4
Original line number Diff line number Diff line
@@ -963,6 +963,10 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend *fe, 
	struct cx24116_state *state = fe->demodulator_priv;

	int i, ret;



	/* Validate length */

	if (d->msg_len > sizeof(d->msg))

                return -EINVAL;



	/* Dump DiSEqC message */

	if (debug) {

		printk(KERN_INFO "cx24116: %s(", __func__);
@@ -974,10 +978,6 @@ static int cx24116_send_diseqc_msg(struct dvb_frontend *fe, 
		printk(") toneburst=%d\n", toneburst);

	}



	/* Validate length */

	if (d->msg_len > (CX24116_ARGLEN - CX24116_DISEQC_MSGOFS))

		return -EINVAL;



	/* DiSEqC message */

	for (i = 0; i < d->msg_len; i++)

		state->dsec_cmd.args[CX24116_DISEQC_MSGOFS + i] = d->msg[i];