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: v3.4.92~158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1a999df834a81d751be87dd62b88f2f99bc650a;p=platform%2Fkernel%2Flinux-stable.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 6f9eb94..25968dc 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;