From: Salva Peiró <speiro@ai2.upv.es>
Date: Wed, 30 Apr 2014 17:48:02 +0000 (+0200)
Subject: media: media-device: fix infoleak in ioctl media_enum_entities()
X-Git-Tag: firefly_0821_release~3679^2~2193
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e32a7c66fae40bde0fbff8cbc893eabe8575135;p=firefly-linux-kernel-4.4.55.git

media: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 1957c0df08fd..79715f9feb0a 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -93,6 +93,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;