summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2018-07-24 19:11:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 08:38:01 +0200
commit0b339773a30ea35b8193552926aaeeeab8be7d83 (patch)
tree76921dad3e86a2d600f657b8193390d5f264adda /drivers/video
parentb2b5343639d1f187fc93dccea356bec7a8036554 (diff)
downloadlinux-stable-0b339773a30ea35b8193552926aaeeeab8be7d83.tar.gz
linux-stable-0b339773a30ea35b8193552926aaeeeab8be7d83.tar.bz2
linux-stable-0b339773a30ea35b8193552926aaeeeab8be7d83.zip
video: fbdev: pxafb: clear allocated memory for video modes
[ 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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/pxafb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index c3d49e13643c..29f00eccdd01 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -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;