2023-01-25 13:50:48

by Natalia Petrova

Subject: [PATCH] net: qrtr: free memory on error path in radix_tree_insert()

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 <[email protected]>
---
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

2023-01-25 15:04:34

by Simon Horman

Subject: Re: [PATCH] net: qrtr: free memory on error path in radix_tree_insert()

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 <[email protected]>

Reviewed-by: Simon Horman <[email protected]>

2023-01-27 05:55:35

by Manivannan Sadhasivam

Subject: Re: [PATCH] net: qrtr: free memory on error path in radix_tree_insert()

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 <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

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

Cc: <[email protected]> # 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
>

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

2023-01-28 08:40:29

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: qrtr: free memory on error path in radix_tree_insert()

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Wed, 25 Jan 2023 16:48:31 +0300 you 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.
>
> [...]

Here is the summary with links:
- net: qrtr: free memory on error path in radix_tree_insert()
https://git.kernel.org/netdev/net/c/29de68c2b32c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html