From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Jarzmik Date: Sun, 10 Jan 2016 20:27:56 +0000 Subject: Re: [PATCH] video: fbdev: pxafb: fix out of memory error path Message-Id: <87io31dvsj.fsf@belgarion.home> List-Id: References: <1450527271-21841-1-git-send-email-robert.jarzmik@free.fr> In-Reply-To: <1450527271-21841-1-git-send-email-robert.jarzmik@free.fr> (Robert Jarzmik's message of "Sat, 19 Dec 2015 13:14:31 +0100") MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Tomi Valkeinen , Jean-Christophe Plagniol-Villard Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Julia Lawall Robert Jarzmik 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 > Signed-off-by: Robert Jarzmik > --- > 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