From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752756AbcKYXQ7 convert rfc822-to-8bit (ORCPT <rfc822;w@1wt.eu>);
        Fri, 25 Nov 2016 18:16:59 -0500
Received: from mga11.intel.com ([192.55.52.93]:59876 "EHLO mga11.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750776AbcKYXQu (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 25 Nov 2016 18:16:50 -0500
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.31,697,1473145200"; 
   d="scan'208";a="1090487796"
From: "Dilger, Andreas" <andreas.dilger@intel.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
CC: "Drokin, Oleg" <oleg.drokin@intel.com>,
        "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
        Sebastien Buisson <sebastien.buisson@bull.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "kernel-janitors@vger.kernel.org" <kernel-janitors@vger.kernel.org>,
        "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
        Vitaly Fertman <vitaly_fertman@xyratex.com>,
        frank zago <fzago@cray.com>, "Shehata, Amir" <amir.shehata@intel.com>,
        "lustre-devel@lists.lustre.org" <lustre-devel@lists.lustre.org>
Subject: Re: [lustre-devel] [patch] staging: lustre/ptlrpc: small leak on
        allocation failure
Thread-Topic: [lustre-devel] [patch] staging: lustre/ptlrpc: small leak on
        allocation failure
Thread-Index: AQHSRkPQOgLBeVlsLkuRuTr/qRfHRaDq3ZGA
Date: Fri, 25 Nov 2016 23:16:48 +0000
Message-ID: <F7C31145-1846-4DD3-8140-79E3D8249545@intel.com>
References: <20161124111204.GH17225@mwanda>
In-Reply-To: <20161124111204.GH17225@mwanda>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [10.254.36.22]
Content-Type: text/plain; charset="us-ascii"
Content-ID: <5424CDABC31DB14496964CE9EE64A192@intel.com>
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Nov 24, 2016, at 04:12, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 
> We should free "desc" before returning NULL.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

> diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
> index ac959ef..8047413 100644
> --- a/drivers/staging/lustre/lustre/ptlrpc/client.c
> +++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
> @@ -128,12 +128,12 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned int nfrags,
> 		GET_KIOV(desc) = kcalloc(nfrags, sizeof(*GET_KIOV(desc)),
> 					 GFP_NOFS);
> 		if (!GET_KIOV(desc))
> -			goto out;
> +			goto free_desc;
> 	} else {
> 		GET_KVEC(desc) = kcalloc(nfrags, sizeof(*GET_KVEC(desc)),
> 					 GFP_NOFS);
> 		if (!GET_KVEC(desc))
> -			goto out;
> +			goto free_desc;
> 	}
> 
> 	spin_lock_init(&desc->bd_lock);
> @@ -154,7 +154,8 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned int nfrags,
> 		LNetInvalidateHandle(&desc->bd_mds[i]);
> 
> 	return desc;
> -out:
> +free_desc:
> +	kfree(desc);
> 	return NULL;
> }
> 
> _______________________________________________
> lustre-devel mailing list
> lustre-devel@lists.lustre.org
> http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org