]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media/vivid-osd: fix info leak in ioctl
authorSalva Peiró <speirofr@gmail.com>
Wed, 7 Oct 2015 10:09:26 +0000 (07:09 -0300)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:43:36 +0000 (15:43 -0700)
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>
drivers/media/platform/vivid/vivid-osd.c

index 084d346fb4c4f6f9c84f17f48a11bd5eea10799c..e15eef6a94e5585ad93a0dc81dcde54563f1aff6 100644 (file)
@@ -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;