Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
Subject: Re: [PATCH 1/1] RDMA/cma: Fix rdma_resolve_route memory leak
To:     Gerd Rausch <gerd.rausch@oracle.com>, <linux-rdma@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@ziepe.ca>
References: <f6662b7b-bdb7-2706-1e12-47c61d3474b6@oracle.com>
From:   Mark Zhang <markzhang@nvidia.com>
Message-ID: <27a35a75-813d-ef1e-c9ca-d4ecbc5a95d2@nvidia.com>
Date:   Fri, 25 Jun 2021 13:49:11 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <f6662b7b-bdb7-2706-1e12-47c61d3474b6@oracle.com>
Content-Type: text/plain; charset="windows-1252"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2021 05:49:15.7584
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7d3e5e-fb4d-4335-62b9-08d9379cf7a7
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT050.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5429
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 6/25/2021 2:55 AM, Gerd Rausch wrote:
> Fix a memory leak when "rmda_resolve_route" is called
> more than once on the same "rdma_cm_id".
> 
> Signed-off-by: Gerd Rausch <gerd.rausch@oracle.com>
> ---
>   drivers/infiniband/core/cma.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index ab148a696c0c..4a76d5b4163e 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -2819,7 +2819,8 @@ static int cma_resolve_ib_route(struct rdma_id_private *id_priv,
>   
>   	cma_init_resolve_route_work(work, id_priv);
>   
> -	route->path_rec = kmalloc(sizeof *route->path_rec, GFP_KERNEL);
> +	if (!route->path_rec)
> +		route->path_rec = kmalloc(sizeof *route->path_rec, GFP_KERNEL);
>   	if (!route->path_rec) {
>   		ret = -ENOMEM;
>   		goto err1;

If route->path_rec does exist (meaning this is not the first time 
called), then it would be freed if cma_query_ib_route() below is failed, 
is it good?