* [PATCH] video: fbdev: pxafb: fix out of memory error path
@ 2015-12-19 12:14 Robert Jarzmik
2016-01-10 20:27 ` Robert Jarzmik
0 siblings, 1 reply; 3+ messages in thread
From: Robert Jarzmik @ 2015-12-19 12:14 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: linux-fbdev, linux-kernel, Julia Lawall, Robert Jarzmik
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 <julia.lawall@lip6.fr>
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;
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] video: fbdev: pxafb: fix out of memory error path
2015-12-19 12:14 [PATCH] video: fbdev: pxafb: fix out of memory error path Robert Jarzmik
@ 2016-01-10 20:27 ` Robert Jarzmik
2016-01-11 11:51 ` Tomi Valkeinen
0 siblings, 1 reply; 3+ messages in thread
From: Robert Jarzmik @ 2016-01-10 20:27 UTC (permalink / raw)
To: Tomi Valkeinen, Jean-Christophe Plagniol-Villard
Cc: linux-fbdev, linux-kernel, Julia Lawall
Robert Jarzmik <robert.jarzmik@free.fr> writes:
> 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 <julia.lawall@lip6.fr>
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] video: fbdev: pxafb: fix out of memory error path
2016-01-10 20:27 ` Robert Jarzmik
@ 2016-01-11 11:51 ` Tomi Valkeinen
0 siblings, 0 replies; 3+ messages in thread
From: Tomi Valkeinen @ 2016-01-11 11:51 UTC (permalink / raw)
To: Robert Jarzmik, Jean-Christophe Plagniol-Villard
Cc: linux-fbdev, linux-kernel, Julia Lawall
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
On 10/01/16 22:27, Robert Jarzmik wrote:
> Robert Jarzmik <robert.jarzmik@free.fr> writes:
>
>> 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 <julia.lawall@lip6.fr>
>> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-11 11:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-19 12:14 [PATCH] video: fbdev: pxafb: fix out of memory error path Robert Jarzmik
2016-01-10 20:27 ` Robert Jarzmik
2016-01-11 11:51 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).