Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (protection.outlook.com: domain of mellanox.com designates
 193.47.165.134 as permitted sender) receiver=protection.outlook.com;
 client-ip=193.47.165.134; helo=mtlcas13.mtl.com;
Subject: Re: [PATCH] nvme: don't free uuid pointer before printing it
To:     Johannes Thumshirn <jthumshirn@suse.de>,
        Christoph Hellwig <hch@lst.de>
CC:     Roland Dreier <roland@purestorage.com>,
        Sagi Grimberg <sagi@grimberg.me>,
        Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
        "Linux NVMe Mailinglist" <linux-nvme@lists.infradead.org>,
        Keith Busch <keith.busch@intel.com>,
        Dan Carpenter <dan.carpenter@oracle.com>
References: <20180125080925.6019-1-jthumshirn@suse.de>
From:   Max Gurtovoy <maxg@mellanox.com>
Message-ID: <cad484e2-4d21-185d-4b28-fb9be12591d5@mellanox.com>
Date:   Thu, 25 Jan 2018 11:37:33 +0200
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.2
MIME-Version: 1.0
In-Reply-To: <20180125080925.6019-1-jthumshirn@suse.de>
Content-Type: text/plain; charset="windows-1255"; format=flowed
Content-Language: he
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2018 09:37:36.9416
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 23f770cd-fd0e-47d8-bef8-08d563d746c0
X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a652971c-7d2e-4d9b-a6a4-d149256f461b;Ip=[193.47.165.134];Helo=[mtlcas13.mtl.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR05MB116
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 1/25/2018 10:09 AM, Johannes Thumshirn wrote:
> Commit df351ef73789 ("nvme-fabrics: fix memory leak when parsing host ID
> option") fixed the leak of 'p' but in case uuid_parse() fails the memory
> is freed before the error print that is using it.
> 
> Free it after printing eventual errors.
> 
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> Fixes: df351ef73789 ("nvme-fabrics: fix memory leak when parsing host ID option")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: Roland Dreier <roland@purestorage.com>
> ---
>   drivers/nvme/host/fabrics.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
> index eb46967bb0d5..9cee72a80472 100644
> --- a/drivers/nvme/host/fabrics.c
> +++ b/drivers/nvme/host/fabrics.c
> @@ -739,12 +739,13 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
>   				goto out;
>   			}
>   			ret = uuid_parse(p, &hostid);
> -			kfree(p);
>   			if (ret) {
>   				pr_err("Invalid hostid %s\n", p);
>   				ret = -EINVAL;
> +				kfree(p);
>   				goto out;
>   			}
> +			kfree(p);
>   			break;
>   		case NVMF_OPT_DUP_CONNECT:
>   			opts->duplicate_connect = true;
> 


Looks good,

Reviewed-by: Max Gurtovoy <maxg@mellanox.com>