diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-02-08 14:24:15 +0100 |
---|---|---|
committer | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-02-09 08:34:01 +0100 |
commit | 2e775f75b52ecd963b842f4b91469f2851a6086b (patch) | |
tree | cc73dff396c4197cce2fd7422161c03d875bc09a | |
parent | ebec07b828fd5467285dfc068fca0f5d8e28b89a (diff) | |
download | meta-fsl-ppc-2e775f75b52ecd963b842f4b91469f2851a6086b.tar.gz |
drivers-media: CVE-2014-1739
Fixes an information leakage in Linux kernel built with
the Multimedia support(CONFIG_MEDIA_SUPPORT).
References:
http://www.openwall.com/lists/oss-security/2014/06/15/1
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-1739
Upstream patch:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/
patch/?id=2f1831612c94ee7b1819c4a6d21b9d5efac5297c
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
-rw-r--r-- | recipes-kernel/linux/files/media-CVE-2014-1739.patch | 35 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq_3.12.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-kernel/linux/files/media-CVE-2014-1739.patch b/recipes-kernel/linux/files/media-CVE-2014-1739.patch new file mode 100644 index 0000000..97ec3c7 --- /dev/null +++ b/recipes-kernel/linux/files/media-CVE-2014-1739.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 2f1831612c94ee7b1819c4a6d21b9d5efac5297c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Salva=20Peir=C3=B3?= <speiro@ai2.upv.es> | ||
3 | Date: Wed, 30 Apr 2014 19:48:02 +0200 | ||
4 | Subject: media: media-device: fix infoleak in ioctl media_enum_entities() | ||
5 | |||
6 | commit e6a623460e5fc960ac3ee9f946d3106233fd28d8 upstream. | ||
7 | |||
8 | This fixes CVE-2014-1739. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | |||
12 | Signed-off-by: Salva Peiró <speiro@ai2.upv.es> | ||
13 | Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | ||
14 | Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
15 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | ||
16 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
17 | --- | ||
18 | drivers/media/media-device.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c | ||
22 | index d5a7a13..703560f 100644 | ||
23 | --- a/drivers/media/media-device.c | ||
24 | +++ b/drivers/media/media-device.c | ||
25 | @@ -93,6 +93,7 @@ static long media_device_enum_entities(struct media_device *mdev, | ||
26 | struct media_entity *ent; | ||
27 | struct media_entity_desc u_ent; | ||
28 | |||
29 | + memset(&u_ent, 0, sizeof(u_ent)); | ||
30 | if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id))) | ||
31 | return -EFAULT; | ||
32 | |||
33 | -- | ||
34 | cgit v0.11.2 | ||
35 | |||
diff --git a/recipes-kernel/linux/linux-qoriq_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb index e033320..262a6c8 100644 --- a/recipes-kernel/linux/linux-qoriq_3.12.bb +++ b/recipes-kernel/linux/linux-qoriq_3.12.bb | |||
@@ -34,6 +34,7 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \ | |||
34 | file://fs-isofs-CVE-2014-9420.patch \ | 34 | file://fs-isofs-CVE-2014-9420.patch \ |
35 | file://udp-CVE-2015-5364_CVE-2015-5366.patch \ | 35 | file://udp-CVE-2015-5364_CVE-2015-5366.patch \ |
36 | file://net-CVE-2015-2041.patch \ | 36 | file://net-CVE-2015-2041.patch \ |
37 | file://media-CVE-2014-1739.patch \ | ||
37 | " | 38 | " |
38 | SRCREV = "6619b8b55796cdf0cec04b66a71288edd3057229" | 39 | SRCREV = "6619b8b55796cdf0cec04b66a71288edd3057229" |
39 | 40 | ||