[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1443571810-5627-1-git-send-email-labbott@fedoraproject.org>
Date: Tue, 29 Sep 2015 17:10:09 -0700
From: Laura Abbott <labbott@...oraproject.org>
To: Antti Palosaari <crope@....fi>,
Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc: Laura Abbott <labbott@...oraproject.org>,
Olli Salonen <olli.salonen@....fi>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
Stuart Auchterlonie <sauchter@...hat.com>, stable@...nel.org
Subject: [PATCH 1/2] si2168: Bounds check firmware
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:
si2168 11-0064: found a 'Silicon Labs Si2168-B40'
si2168 11-0064: downloading firmware from file 'dvb-demod-si2168-b40-01.fw'
si2168 11-0064: firmware download failed -95
Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffffa085708f
Add the proper check.
Cc: stable@...nel.org
Reported-by: Stuart Auchterlonie <sauchter@...hat.com>
Reviewed-by: Antti Palosaari <crope@....fi>
Signed-off-by: Laura Abbott <labbott@...oraproject.org>
---
drivers/media/dvb-frontends/si2168.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 81788c5..821a8f4 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -502,6 +502,10 @@ static int si2168_init(struct dvb_frontend *fe)
/* firmware is in the new format */
for (remaining = fw->size; remaining > 0; remaining -= 17) {
len = fw->data[fw->size - remaining];
+ if (len > SI2168_ARGLEN) {
+ ret = -EINVAL;
+ break;
+ }
memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
cmd.wlen = len;
cmd.rlen = 1;
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists