summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-09-29 21:10:10 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-09 14:33:33 -0800
commitf7832ff91dd51ad2a43bd37846f9cef15b8c03e6 (patch)
treee7a416c762e84c31ba01329645f2ef5704954db1 /drivers
parentd347b289bf2767fe6d2c87589c38cc194a6a07c5 (diff)
si2157: Bounds check firmware
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/tuners/si2157.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index d74ae26621ca..c5dbba5b5bc9 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;