From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759050AbcAKLv5 (ORCPT ); Mon, 11 Jan 2016 06:51:57 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:33358 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758017AbcAKLvz (ORCPT ); Mon, 11 Jan 2016 06:51:55 -0500 Subject: Re: [PATCH] video: fbdev: pxafb: fix out of memory error path To: Robert Jarzmik , Jean-Christophe Plagniol-Villard References: <1450527271-21841-1-git-send-email-robert.jarzmik@free.fr> <87io31dvsj.fsf@belgarion.home> CC: , , Julia Lawall From: Tomi Valkeinen Message-ID: <5693974E.2000604@ti.com> Date: Mon, 11 Jan 2016 13:51:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <87io31dvsj.fsf@belgarion.home> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ibg1XeMJwXn4iGdQ6tPPU76K9o9UjROiv" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --ibg1XeMJwXn4iGdQ6tPPU76K9o9UjROiv Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/01/16 22:27, Robert Jarzmik wrote: > Robert Jarzmik writes: >=20 >> 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 *d= ev) >> ret =3D -ENOMEM; >> pdata =3D dev_get_platdata(&dev->dev); >> inf =3D devm_kmalloc(&dev->dev, sizeof(*inf), GFP_KERNEL); >> + if (!inf) >> + goto failed; >> =20 >> if (pdata) { >> *inf =3D *pdata; > Tomi, Jean-Christophe, >=20 > Can you carry out this fix please ? Thanks, queued for 4.5. Tomi --ibg1XeMJwXn4iGdQ6tPPU76K9o9UjROiv Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWk5dOAAoJEPo9qoy8lh71GDAP/RcL8uL0SwDHLakIalSfB5wP oddT4b/KKK+EoVxl/bdrjCF0gBz+Nrsz4i6JRcjFWZUrpwhWeN7c1p1E5f/QkbV/ BVmnl59nlKyHcs0sovXdp40jRLjIaJwxClmqlCxcRh4J6wf4g0R6kcGAmmx5PBqo 6DTSy0O5VKTgFrSvmhtJhQHQxGN8jFDsIY8WFU2QBbV7ngfFUdW54peraOwFzzOY flTRSG1hHZCFLEMnWL0o906mAGJKMBUqpyDY6SJ1POTVGIg4+hO3laW64w8uDGLY 7SgJYq2yGQyILYMX/aDyeX3OCRlCT8KHETar6ia1oOX70FoN0Rfz/dXMC54hGFsp 6wOUQOvoR7Vk0yxn1Z0EHEvgAMrRPsXjrnLXCAyqEvibVkm9fzAvU856mnBg/pab SzRDstrd+0cZ+3ZIihUElJdTMYbWoNdb9w8chaUGVSSGG5ofeNSfbp4b3FqVyKqn 51e1iwskS4nBnkuQqGP7y7SSTskq4E3HVH3g1x8KbKTtHxkNyLP4r84OWEz8QyOR gzz4AV1vrpMd1LSPeTDF7Ko5dCNWPzgq1589fVPoMQIYHPGtyRK3RJQhyhrww4yV cwpBuLl/rCUxs/toYoIK/9TkYjJw7p6ISZ2G9QNf8Q++J4RC39EIGNTDE6OBUZcw t1/fUpVjwddpk277PMBA =cyJv -----END PGP SIGNATURE----- --ibg1XeMJwXn4iGdQ6tPPU76K9o9UjROiv--