Messages in this thread | | | Subject | Re: [PATCH] video: fbdev: pxafb: fix out of memory error path | From | Tomi Valkeinen <> | Date | Mon, 11 Jan 2016 13:51:42 +0200 |
| |
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
[unhandled content-type:application/pgp-signature]
| |