diff options
| author | Salva Peiró <speiro@ai2.upv.es> | 2014-04-30 19:48:02 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2014-08-19 16:16:49 +1000 |
| commit | fdd5d92829f074cceab7c775b85b7cc9d599d7a5 (patch) | |
| tree | ed31bd72726236ac08d6cbb13504cf3c54826e0c | |
| parent | c9bb4d2cd42985abed5159c9f192df5acc225bea (diff) | |
| download | powerpc-fdd5d92829f074cceab7c775b85b7cc9d599d7a5.tar.gz | |
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>
(cherry picked from commit 4e32a7c66fae40bde0fbff8cbc893eabe8575135)
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | drivers/media/media-device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 1957c0df08fdb5..79715f9feb0a42 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; |