summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/files/media-CVE-2014-1739.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/files/media-CVE-2014-1739.patch')
-rw-r--r--recipes-kernel/linux/files/media-CVE-2014-1739.patch35
1 files changed, 35 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 @@
1From 2f1831612c94ee7b1819c4a6d21b9d5efac5297c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Salva=20Peir=C3=B3?= <speiro@ai2.upv.es>
3Date: Wed, 30 Apr 2014 19:48:02 +0200
4Subject: media: media-device: fix infoleak in ioctl media_enum_entities()
5
6commit e6a623460e5fc960ac3ee9f946d3106233fd28d8 upstream.
7
8This fixes CVE-2014-1739.
9
10Upstream-Status: Backport
11
12Signed-off-by: Salva Peiró <speiro@ai2.upv.es>
13Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
14Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
15Signed-off-by: Jiri Slaby <jslaby@suse.cz>
16Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
17---
18 drivers/media/media-device.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
22index 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--
34cgit v0.11.2
35