diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2015-12-02 12:21:40 +0100 |
---|---|---|
committer | Huimin She <huimin.she@enea.com> | 2015-12-03 10:58:17 +0100 |
commit | 380a96f628fab2263cc12d72b15bf432a9528435 (patch) | |
tree | b7d54d4036204fd3566aeab0079410a3739242d3 | |
parent | 5fb22e9981f17dc3a9111abebb315595cb7d240c (diff) | |
download | meta-enea-380a96f628fab2263cc12d72b15bf432a9528435.tar.gz |
media-ttusb-dec: CVE-2014-8884
Fixes buffer overflow in ioctl.
Fix for linux-qoriq 3.12.
Reference:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-8884
Upstream fix:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/
?id=482c6cb2dfb40838d67b0ba844b4b3d0af0f3d20
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Huimin She <huimin.she@enea.com>
-rw-r--r-- | recipes-kernel/linux/files/media-ttusb-dec-CVE-2014-8884.patch | 35 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq-common.inc | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-kernel/linux/files/media-ttusb-dec-CVE-2014-8884.patch b/recipes-kernel/linux/files/media-ttusb-dec-CVE-2014-8884.patch new file mode 100644 index 0000000..08fe73b --- /dev/null +++ b/recipes-kernel/linux/files/media-ttusb-dec-CVE-2014-8884.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Date: Fri, 5 Sep 2014 09:09:28 -0300 | ||
2 | Subject: [media] ttusb-dec: buffer overflow in ioctl | ||
3 | |||
4 | commit f2e323ec96077642d397bb1c355def536d489d16 upstream. | ||
5 | |||
6 | We need to add a limit check here so we don't overflow the buffer. | ||
7 | |||
8 | Fixes CVE-2014-8884 | ||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> | ||
12 | Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> | ||
13 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | ||
14 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
15 | --- | ||
16 | drivers/media/usb/ttusb-dec/ttusbdecfe.c | 3 +++ | ||
17 | 1 file changed, 3 insertions(+) | ||
18 | |||
19 | diff --git a/drivers/media/usb/ttusb-dec/ttusbdecfe.c b/drivers/media/usb/ttusb-dec/ttusbdecfe.c | ||
20 | index 5c45c9d..9c29552 100644 | ||
21 | --- a/drivers/media/usb/ttusb-dec/ttusbdecfe.c | ||
22 | +++ b/drivers/media/usb/ttusb-dec/ttusbdecfe.c | ||
23 | @@ -156,6 +156,9 @@ static int ttusbdecfe_dvbs_diseqc_send_master_cmd(struct dvb_frontend* fe, struc | ||
24 | 0x00, 0x00, 0x00, 0x00, | ||
25 | 0x00, 0x00 }; | ||
26 | |||
27 | + if (cmd->msg_len > sizeof(b) - 4) | ||
28 | + return -EINVAL; | ||
29 | + | ||
30 | memcpy(&b[4], cmd->msg, cmd->msg_len); | ||
31 | |||
32 | state->config->send_command(fe, 0x72, | ||
33 | -- | ||
34 | cgit v0.11.2 | ||
35 | |||
diff --git a/recipes-kernel/linux/linux-qoriq-common.inc b/recipes-kernel/linux/linux-qoriq-common.inc index dc7eab2..5a5d7e9 100644 --- a/recipes-kernel/linux/linux-qoriq-common.inc +++ b/recipes-kernel/linux/linux-qoriq-common.inc | |||
@@ -5,6 +5,7 @@ SRC_URI += "file://b4860-hard_irq_disable-bug.patch \ | |||
5 | file://powerpc-fsl-booke64-Set-vmemmap_psize-to-4K.patch \ | 5 | file://powerpc-fsl-booke64-Set-vmemmap_psize-to-4K.patch \ |
6 | file://mm-CVE-2014-3122.patch \ | 6 | file://mm-CVE-2014-3122.patch \ |
7 | file://IB-uverbs-CVE-2014-8159.patch \ | 7 | file://IB-uverbs-CVE-2014-8159.patch \ |
8 | file://media-ttusb-dec-CVE-2014-8884.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI += "file://cfg/00013-localversion.cfg \ | 11 | SRC_URI += "file://cfg/00013-localversion.cfg \ |