]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
video: fbdev: pxafb: clear allocated memory for video modes
authorDaniel Mack <daniel@zonque.org>
Tue, 24 Jul 2018 17:11:25 +0000 (19:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:38:01 +0000 (08:38 +0200)
[ Upstream commit b951d80aaf224b1f774e10def672f5e37488e4ee ]

When parsing the video modes from DT properties, make sure to zero out
memory before using it. This is important because not all fields in the mode
struct are explicitly initialized, even though they are used later on.

Fixes: 420a488278e86 ("video: fbdev: pxafb: initial devicetree conversion")
Reviewed-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/video/fbdev/pxafb.c

index c3d49e13643cd21504d7ffa62f1231d6a9a8ef38..29f00eccdd015474858023a7af300c73d0d9f8ee 100644 (file)
@@ -2130,8 +2130,8 @@ static int of_get_pxafb_display(struct device *dev, struct device_node *disp,
                return -EINVAL;
 
        ret = -ENOMEM;
-       info->modes = kmalloc_array(timings->num_timings,
-                                   sizeof(info->modes[0]), GFP_KERNEL);
+       info->modes = kcalloc(timings->num_timings, sizeof(info->modes[0]),
+                             GFP_KERNEL);
        if (!info->modes)
                goto out;
        info->num_modes = timings->num_timings;