summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSalva Peiró <speiro@ai2.upv.es>2014-04-30 19:48:02 +0200
committerBen Hutchings <ben@decadent.org.uk>2014-06-09 13:29:05 +0100
commit5003eea6cec931203469521351918d4a54c18185 (patch)
treeec3c29e3218bc7abb5f4da4ae20cb7b9eae08004 /drivers
parent21d2e13e30c300e1a9eca42723454d67901bf58f (diff)
downloadlinux-stable-5003eea6cec931203469521351918d4a54c18185.tar.gz
linux-stable-5003eea6cec931203469521351918d4a54c18185.tar.bz2
linux-stable-5003eea6cec931203469521351918d4a54c18185.zip
media-device: fix infoleak in ioctl media_enum_entities()
commit e6a623460e5fc960ac3ee9f946d3106233fd28d8 upstream. This fixes CVE-2014-1739. Signed-off-by: Salva Peiró <speiro@ai2.upv.es> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/media-device.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 6edc9ba81203..298703fca3b5 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -90,6 +90,7 @@ static long media_device_enum_entities(struct media_device *mdev,
struct media_entity *ent;
struct media_entity_desc u_ent;
+ memset(&u_ent, 0, sizeof(u_ent));
if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id)))
return -EFAULT;