From: Laura Abbott <labbott@fedoraproject.org>
Date: Wed, 30 Sep 2015 00:10:10 +0000 (-0300)
Subject: si2157: Bounds check firmware
X-Git-Tag: v4.1.12-92~201^2~89
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9aeeb4203215b0dd3ad046b90c57687d1764049;p=users%2Fjedix%2Flinux-maple.git

si2157: Bounds check firmware

Orabug: 22623808

commit a828d72df216c36e9c40b6c24dc4b17b6f7b5a76 upstream.

When reading the firmware and sending commands, the length
must be bounds checked to avoid overrunning the size of the command
buffer and smashing the stack if the firmware is not in the
expected format. Add the proper check.

Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit f7832ff91dd51ad2a43bd37846f9cef15b8c03e6)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index d74ae26621ca5..c5dbba5b5bc94 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -165,6 +165,10 @@ static int si2157_init(struct dvb_frontend *fe)
 
 	for (remaining = fw->size; remaining > 0; remaining -= 17) {
 		len = fw->data[fw->size - remaining];
+		if (len > SI2157_ARGLEN) {
+			dev_err(&client->dev, "Bad firmware length\n");
+			goto err_release_firmware;
+		}
 		memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
 		cmd.wlen = len;
 		cmd.rlen = 1;