Re: [PATCH] video: fbdev: pxafb: fix out of memory error path

2 messages, 2 authors, 2016-01-11 · open the first message on its own page

Re: [PATCH] video: fbdev: pxafb: fix out of memory error path

From: Robert Jarzmik <robert.jarzmik@free.fr>
Date: 2016-01-10 20:28:01

Robert Jarzmik [off-list ref] writes:
quoted hunk
As seen by Julia, the initial allocation memory is not checked anymore
after commit "video: fbdev: pxafb: initial devicetree conversion".
Introduce back the removed test.

Reported-by: Julia Lawall <redacted>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 drivers/video/fbdev/pxafb.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index 8588dd683105..54666424a720 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2252,6 +2252,8 @@ static int pxafb_probe(struct platform_device *dev)
 	ret = -ENOMEM;
 	pdata = dev_get_platdata(&dev->dev);
 	inf = devm_kmalloc(&dev->dev, sizeof(*inf), GFP_KERNEL);
+	if (!inf)
+		goto failed;
 
 	if (pdata) {
 		*inf = *pdata;
Tomi, Jean-Christophe,

Can you carry out this fix please ?

Cheers.

-- 
Robert

Re: [PATCH] video: fbdev: pxafb: fix out of memory error path

From: Tomi Valkeinen <hidden>
Date: 2016-01-11 11:51:57


On 10/01/16 22:27, Robert Jarzmik wrote:
Robert Jarzmik [off-list ref] writes:
quoted
As seen by Julia, the initial allocation memory is not checked anymore
after commit "video: fbdev: pxafb: initial devicetree conversion".
Introduce back the removed test.

Reported-by: Julia Lawall <redacted>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 drivers/video/fbdev/pxafb.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index 8588dd683105..54666424a720 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2252,6 +2252,8 @@ static int pxafb_probe(struct platform_device *dev)
 	ret = -ENOMEM;
 	pdata = dev_get_platdata(&dev->dev);
 	inf = devm_kmalloc(&dev->dev, sizeof(*inf), GFP_KERNEL);
+	if (!inf)
+		goto failed;
 
 	if (pdata) {
 		*inf = *pdata;
Tomi, Jean-Christophe,

Can you carry out this fix please ?
Thanks, queued for 4.5.

 Tomi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help