summaryrefslogtreecommitdiff
path: root/drivers/media/media-device.c
diff options
context:
space:
mode:
authorSalva Peiró <speiro@ai2.upv.es>2014-04-30 19:48:02 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-01 05:53:28 -0700
commite6a623460e5fc960ac3ee9f946d3106233fd28d8 (patch)
treede57e5047566c32f45d515cd1cfc8b8c5ba3b18a /drivers/media/media-device.c
parent8845cc6415ec28ef8d57b3fb81c75ef9bce69c5f (diff)
[media] media-device: fix infoleak in ioctl media_enum_entities()
This fixes CVE-2014-1739. Signed-off-by: Salva Peiró <speiro@ai2.upv.es> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: stable@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/media-device.c')
-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 d5a7a135f75d..703560fa5e73 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;