From 6f6abd360603aff043352db90c28748c8c46560e Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Sat, 19 Dec 2015 13:14:31 +0100 Subject: video: fbdev: pxafb: fix out of memory error path 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 Signed-off-by: Robert Jarzmik Signed-off-by: Tomi Valkeinen diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index 987eb8c..33b2bb3 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c @@ -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; -- cgit v0.10.2