From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbdJYHul (ORCPT ); Wed, 25 Oct 2017 03:50:41 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34240 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751782AbdJYHuj (ORCPT ); Wed, 25 Oct 2017 03:50:39 -0400 X-Google-Smtp-Source: ABhQp+R9UoWH4i8wvFH3aEr7h1XfjQqIceZxiaTcU+UjHkzWM3QrXtikW5C9NjEGP6xNA7Aq92wXsQ== Subject: Re: [PATCH] jfs: Add missing NULL pointer check in __get_metapage To: shaggy@kernel.org, jfs-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org References: <20171004082441.2405-1-juerg.haefliger@canonical.com> From: Juerg Haefliger Message-ID: <1dbf4a54-968f-0ca7-da96-e262c653fecb@canonical.com> Date: Wed, 25 Oct 2017 09:50:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171004082441.2405-1-juerg.haefliger@canonical.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hV35HIED6a18NpNApBTneaIvB5vO6msRP" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hV35HIED6a18NpNApBTneaIvB5vO6msRP Content-Type: multipart/mixed; boundary="pINwFRCIFrBS4eljfHe1HWXHVnwFJVvSs"; protected-headers="v1" From: Juerg Haefliger To: shaggy@kernel.org, jfs-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org Message-ID: <1dbf4a54-968f-0ca7-da96-e262c653fecb@canonical.com> Subject: Re: [PATCH] jfs: Add missing NULL pointer check in __get_metapage References: <20171004082441.2405-1-juerg.haefliger@canonical.com> In-Reply-To: <20171004082441.2405-1-juerg.haefliger@canonical.com> --pINwFRCIFrBS4eljfHe1HWXHVnwFJVvSs Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Is this a patch you might consider? Thanks =2E..Juerg On 10/04/2017 10:24 AM, Juerg Haefliger wrote: > alloc_metapage can return a NULL pointer so check for that. And also em= it > an error message if that happens. >=20 > Signed-off-by: Juerg Haefliger > --- > fs/jfs/jfs_metapage.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) >=20 > diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c > index 1c4b9ad4d7ab..00f21af66872 100644 > --- a/fs/jfs/jfs_metapage.c > +++ b/fs/jfs/jfs_metapage.c > @@ -187,14 +187,18 @@ static inline struct metapage *alloc_metapage(gfp= _t gfp_mask) > { > struct metapage *mp =3D mempool_alloc(metapage_mempool, gfp_mask); > =20 > - if (mp) { > - mp->lid =3D 0; > - mp->lsn =3D 0; > - mp->data =3D NULL; > - mp->clsn =3D 0; > - mp->log =3D NULL; > - init_waitqueue_head(&mp->wait); > + if (!mp) { > + jfs_err("mempool_alloc failed!\n"); > + return NULL; > } > + > + mp->lid =3D 0; > + mp->lsn =3D 0; > + mp->data =3D NULL; > + mp->clsn =3D 0; > + mp->log =3D NULL; > + init_waitqueue_head(&mp->wait); > + > return mp; > } > =20 > @@ -663,6 +667,8 @@ struct metapage *__get_metapage(struct inode *inode= , unsigned long lblock, > } else { > INCREMENT(mpStat.pagealloc); > mp =3D alloc_metapage(GFP_NOFS); > + if (!mp) > + goto unlock; > mp->page =3D page; > mp->sb =3D inode->i_sb; > mp->flag =3D 0; >=20 --pINwFRCIFrBS4eljfHe1HWXHVnwFJVvSs-- --hV35HIED6a18NpNApBTneaIvB5vO6msRP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQI7BAEBCAAlBQJZ8EJMHhxqdWVyZy5oYWVmbGlnZXJAY2Fub25pY2FsLmNvbQAK CRB1TDqW+fi0jAuoD/9beZSLeWzOEhBzYqhowE+RILY/N9v7E5KnRXC+VC/OpQ6m S8s35S8wPbh19LhbYSpn+JZXcmgeBoRZV/VqCr7yXh9L2qA45RxQGs5ASm0Gel92 UTrdTm+WEyMcQWO91z4BcjPuPxutBA3aSiBocqxq8vpjS0jydP5aJG3YBT9gX59f dM11O9xWjfW8DuV0ProwNav/lOHOzLpulunvd0HfVfNLPUYu4thBMGAzyFRQ4f58 a+ePJGfJovY7ldcIycyFa/ogoVjCBGDT2HKkHsjH/YI6M9fZTDL6/0oA2XM3Wxc5 psqks0zk5POAoLeAYK859DbPHsuAvW/VzCdzPtxmVfDcy+FRCTFwpSVQO1aqV68o ZfDhdWyLB9f5l3K9/RWs0S4VyGhukLV+FKUioICZizhKuXB85NEL9bSSEglM7M3y ntcxYns8mB3BVWfD7muPGWk7RbO9QM3aHoGZVVFEqZrGlmR6jExV+L2HM77K0c7J RguT8WsIAezHwDczMrrOXUJIt171C4LOVPzkTLVoJQstSMxmqPBsI6t9dfHB5/Gz ysFE4MVoYszeIUo5mIgxr+yV5T+YTc/v9fuNEwaRtI7ytaksFiHOFj7wcq4z1ncx F4hFSowsOFM3VvfAefzEVx+lOouTdplF0hRTS8WgB2wlGtR63gsS8a2VER1Zfg== =eoyn -----END PGP SIGNATURE----- --hV35HIED6a18NpNApBTneaIvB5vO6msRP--