From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755040AbbJUUnn (ORCPT ); Wed, 21 Oct 2015 16:43:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49489 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750698AbbJUUnl (ORCPT ); Wed, 21 Oct 2015 16:43:41 -0400 Subject: Re: [PATCH] usnic: correctly check failed allocation To: Insu Yun , umalhi@cisco.com, sean.hefty@intel.com, hal.rosenstock@gmail.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org References: <1444943715-31250-1-git-send-email-wuninsu@gmail.com> Cc: taesoo@gatech.edu, yeongjin.jang@gatech.edu, insu@gatech.edu From: Doug Ledford Openpgp: id=AE6B1BDA122B23B4265B1274B826A3330E572FDD; url=pgp.mit.edu Organization: Red Hat, Inc. Message-ID: <5627F8FB.5050102@redhat.com> Date: Wed, 21 Oct 2015 16:43:39 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1444943715-31250-1-git-send-email-wuninsu@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AlioaLe9sFPlj5t8gHGjeAVR0rfGXc3xp" 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) --AlioaLe9sFPlj5t8gHGjeAVR0rfGXc3xp Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/15/2015 05:15 PM, Insu Yun wrote: > Since ib_alloc_device returns allocated memory address, not error, > it should be checked as IS_NULL, not IS_ERR_OR_NULL. >=20 > Signed-off-by: Insu Yun Thanks, applied. > --- > drivers/infiniband/hw/usnic/usnic_ib_main.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infi= niband/hw/usnic/usnic_ib_main.c > index 34c49b8..cbc0514 100644 > --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c > +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c > @@ -328,16 +328,15 @@ static void *usnic_ib_device_add(struct pci_dev *= dev) > netdev =3D pci_get_drvdata(dev); > =20 > us_ibdev =3D (struct usnic_ib_dev *)ib_alloc_device(sizeof(*us_ibdev)= ); > - if (IS_ERR_OR_NULL(us_ibdev)) { > + if (!us_ibdev) { > usnic_err("Device %s context alloc failed\n", > netdev_name(pci_get_drvdata(dev))); > - return ERR_PTR(us_ibdev ? PTR_ERR(us_ibdev) : -EFAULT); > + return ERR_PTR(-EFAULT); > } > =20 > us_ibdev->ufdev =3D usnic_fwd_dev_alloc(dev); > - if (IS_ERR_OR_NULL(us_ibdev->ufdev)) { > - usnic_err("Failed to alloc ufdev for %s with err %ld\n", > - pci_name(dev), PTR_ERR(us_ibdev->ufdev)); > + if (!us_ibdev->ufdev) { > + usnic_err("Failed to alloc ufdev for %s\n", pci_name(dev)); > goto err_dealloc; > } > =20 >=20 --=20 Doug Ledford GPG KeyID: 0E572FDD --AlioaLe9sFPlj5t8gHGjeAVR0rfGXc3xp 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 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJWJ/j7AAoJELgmozMOVy/dFJMP/2BUmlzrqEeaT46jo9+90jF8 gmGJdD/W4ObBSfVplWjDqoW6ENIQxox3S621R506NeMyLp+YwpDjuc7DdjZxvvBL vwCP6Oblq1jLc5SM0xtRbLfOu3+loSTtla48Hhfw/+xoAy8OCMIuyVWpXc4x+L9y N64B4btOxja59uu5kQg31q8COgH0oNQfx127k4cmCt9LZU5CwoZZ6n02vUnsN+XN MX4lIAMr36oZx5BISqPXuPg4pHdxuT+lEy/wnuuSFZ7Gfn6JRkIZgoi+HYOZ0Pxh +hxIXtDo/4Gxzcthur9EW7zeiI1NYtYG1+AAZcPoJYFbveZPATXRoEJMdQ71JeI9 aD6K9nVTS77iXDo15P2CGdA8nwj3UifK65psnil3LJ4OgD+bIu0Gv+25OoHUKsiG d/RZzKwAWC7b6ts7x8opo0JykILhoJDClDu5ZsAx1oij8FAqaHAhIATQmSFt0XPD 4f3T43kTxhrx+IdlG1RZW6ogjOGJsMIR3khPwVrTL26ilovM38Q/nLk7/yxMDImG CzCAnkeAt5N5Ofes9nFwynEYwqCIAhPPDrxEDQsPAsV2dONtk8e0ZWWUF4U3gUFD PBKvuQVZVgcDgVzzSBsGyYvYRy/LYn8sfBoBn9KxNhjaZsW36ka1pXpQ1odAivwP lt/WclxEpFiipCFcDasX =mVJx -----END PGP SIGNATURE----- --AlioaLe9sFPlj5t8gHGjeAVR0rfGXc3xp--