Date:   Fri, 27 Jan 2023 11:25:09 +0530
From:   Manivannan Sadhasivam <mani@kernel.org>
To:     Natalia Petrova <n.petrova@fintech.ru>
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-arm-msm@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        lvc-project@linuxtesting.org
Subject: Re: [PATCH] net: qrtr: free memory on error path in
 radix_tree_insert()
Message-ID: <20230127055509.GA7809@thinkpad>
References: <20230125134831.8090-1-n.petrova@fintech.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20230125134831.8090-1-n.petrova@fintech.ru>
Precedence: bulk

On Wed, Jan 25, 2023 at 04:48:31PM +0300, Natalia Petrova wrote:
> Function radix_tree_insert() returns errors if the node hasn't
> been initialized and added to the tree.
> 
> "kfree(node)" and return value "NULL" of node_get() help
> to avoid using unclear node in other calls.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")
> Signed-off-by: Natalia Petrova <n.petrova@fintech.ru>

Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>

This patch should also be backported to stable kernels. Could you please add,

Cc: <stable@vger.kernel.org> # 5.7

Thanks,
Mani

> ---
>  net/qrtr/ns.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
> index 1990d496fcfc..e595079c2caf 100644
> --- a/net/qrtr/ns.c
> +++ b/net/qrtr/ns.c
> @@ -83,7 +83,10 @@ static struct qrtr_node *node_get(unsigned int node_id)
>  
>  	node->id = node_id;
>  
> -	radix_tree_insert(&nodes, node_id, node);
> +	if (radix_tree_insert(&nodes, node_id, node)) {
> +		kfree(node);
> +		return NULL;
> +	}
>  
>  	return node;
>  }
> -- 
> 2.34.1
> 

-- 
மணிவண்ணன் சதாசிவம்