commit 4e32a7c66fae40bde0fbff8cbc893eabe8575135
author Salva Peiró <speiro@ai2.upv.es> Wed Apr 30 19:48:02 2014 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Sat Jun 07 13:25:35 2014 -0700
tree d83c0e11290a36737bc469343b24459ca1690308
parent c4f3c998c17e31c73c1ab223469435a12358d25e

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>

drivers/media/media-device.c

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