summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalva Peiró <speirofr@gmail.com>2015-10-07 07:09:26 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-31 11:23:40 -0800
commitb824d64b153a9683aed6730e9f093a7102c36799 (patch)
treefb4672eff2431be566910ea0df0c2d74c7b46ef0
parent3f0cf7dcf712ef29ca47cd2f0b20292aab6e1d59 (diff)
downloadlwn-b824d64b153a9683aed6730e9f093a7102c36799.tar.gz
lwn-b824d64b153a9683aed6730e9f093a7102c36799.zip
media/vivid-osd: fix info leak in ioctl
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>
-rw-r--r--drivers/media/platform/vivid/vivid-osd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c
index 084d346fb4c4..e15eef6a94e5 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;