Commit 720db91c authored Oct 05, 2015 by Laura Abbott Committed by Sasha Levin Apr 13, 2016

[media] si2157: return -EINVAL if firmware blob is too big



[ Upstream commit d2cc2f0b35465951eaaf0387fd55e29835ed7ea6 ]

A previous patch added a check if the firmware is too big, but it didn't
set the return error code with the right value.

[mchehab@osg.samsung.com: I ended by applying a v1 of Laura's patch, without
 the proper return code. This patch contains the difference between v2 and v1 of
 the Laura's "si2157: Bounds check firmware" patch]
Cc: stable@kernel.org
Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
Reviewed-by: Olli Salonen <olli.salonen@iki.fi>
Tested-by: Olli Salonen <olli.salonen@iki.fi>

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 7bd07d0a

drivers/media/tuners/si2157.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -159,6 +159,7 @@ static int si2157_init(struct dvb_frontend *fe)
	len = fw->data[fw->size - remaining];		len = fw->data[fw->size - remaining];
	if (len > SI2157_ARGLEN) {		if (len > SI2157_ARGLEN) {
	dev_err(&s->client->dev, "Bad firmware length\n");		dev_err(&s->client->dev, "Bad firmware length\n");
			ret = -EINVAL;
	goto err;		goto err;
	}		}
	memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);		memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);