video: fbdev: pxafb: clear allocated memory for video modes

Started by Daniel Mack on Jun 24, 2018 · 5 messages from 2 authors · Last reply Jul 24, 2018

Subsystems (2)

Maintainers (2)

STALE3033d REVIEWED · 1 review, 1 by a maintainer

Status: Reviewed.

1 review trailer.

open the first message on its own page

Message details and related content
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>
---
 drivers/video/fbdev/pxafb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index 76722a59f55e..dfe382e68287 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2128,8 +2128,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;
-- 
2.17.1
Message details and related content
Hi Bartlomiej,

Should I resend with Robert's Reviewed-bys again? I'd like to get this 
merged for 4.19 if possible.


Thanks,
Daniel


On Sunday, June 24, 2018 05:38 PM, Daniel Mack wrote:
quoted hunk
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>
---
  drivers/video/fbdev/pxafb.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index 76722a59f55e..dfe382e68287 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2128,8 +2128,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;
Message details and related content
On Sunday, June 24, 2018 05:38:14 PM Daniel Mack wrote:
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>
Patch queued for 4.19, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Message details and related content
On Monday, July 09, 2018 07:12:50 AM Daniel Mack wrote:
Hi Bartlomiej,
Hi,
Should I resend with Robert's Reviewed-bys again? I'd like to get this 
merged for 4.19 if possible.
No need for resend, I added Robert's tags while applying your patches.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Message details and related content
On Tuesday, July 24, 2018 05:03 PM, Bartlomiej Zolnierkiewicz wrote:
On Monday, July 09, 2018 07:12:50 AM Daniel Mack wrote:
quoted
Should I resend with Robert's Reviewed-bys again? I'd like to get this
merged for 4.19 if possible.
No need for resend, I added Robert's tags while applying your patches.
Great, thank you!

Daniel
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help