[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160301234531.770469393@linuxfoundation.org>
Date: Tue, 01 Mar 2016 23:54:24 +0000
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: <linux-kernel@...r.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
<stable@...r.kernel.org>, Laura Abbott <labbott@...oraproject.org>,
Olli Salonen <olli.salonen@....fi>,
Mauro Carvalho Chehab <mchehab@....samsung.com>
Subject: [PATCH 4.4 118/342] [media] si2157: return -EINVAL if firmware blob is too big
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laura Abbott <labbott@...oraproject.org>
commit d2cc2f0b35465951eaaf0387fd55e29835ed7ea6 upstream.
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@....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]
Signed-off-by: Laura Abbott <labbott@...oraproject.org>
Reviewed-by: Olli Salonen <olli.salonen@....fi>
Tested-by: Olli Salonen <olli.salonen@....fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@....samsung.com>
---
drivers/media/tuners/si2157.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -168,6 +168,7 @@ static int si2157_init(struct dvb_fronte
len = fw->data[fw->size - remaining];
if (len > SI2157_ARGLEN) {
dev_err(&client->dev, "Bad firmware length\n");
+ ret = -EINVAL;
goto err_release_firmware;
}
memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
Powered by blists - more mailing lists