From: Salva Peiró <speirofr@gmail.com>
Date: Wed, 7 Oct 2015 10:09:26 +0000 (-0300)
Subject: media/vivid-osd: fix info leak in ioctl
X-Git-Tag: v4.1.12-92~150^2~338
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=36d8cc5874f6b3017a454fe55b517946bb8f6cc6;p=users%2Fjedix%2Flinux-maple.git

media/vivid-osd: fix info leak in ioctl

Orabug: 23330583

commit eda98796aff0d9bf41094b06811f5def3b4c333c upstream.

The vivid_fb_ioctl() code fails to initialize the 16 _reserved bytes of
struct fb_vblank after the ->hcount member. Add an explicit
memset(0) before filling the structure to avoid the info leak.

Signed-off-by: Salva Peiró <speirofr@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit b824d64b153a9683aed6730e9f093a7102c36799)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c
index 084d346fb4c4f..e15eef6a94e55 100644
--- a/drivers/media/platform/vivid/vivid-osd.c
+++ b/drivers/media/platform/vivid/vivid-osd.c
@@ -85,6 +85,7 @@ static int vivid_fb_ioctl(struct fb_info *info, unsigned cmd, unsigned long arg)
 	case FBIOGET_VBLANK: {
 		struct fb_vblank vblank;
 
+		memset(&vblank, 0, sizeof(vblank));
 		vblank.flags = FB_VBLANK_HAVE_COUNT | FB_VBLANK_HAVE_VCOUNT |
 			FB_VBLANK_HAVE_VSYNC;
 		vblank.count = 0;