video: fbdev: pxafb: fix out of memory error path
authorRobert Jarzmik <robert.jarzmik@free.fr>
Sat, 19 Dec 2015 12:14:31 +0000 (13:14 +0100)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 18 Jan 2016 08:26:17 +0000 (10:26 +0200)
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>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/pxafb.c

index 987eb8c4f92628c7c9d9245bc95319b637b691f4..33b2bb315a2a462daefa5bc2c3181806747dc919 100644 (file)
@@ -2249,6 +2249,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;