| Message ID | 20230125134831.8090-1-n.petrova@fintech.ru |
|---|---|
| State | Accepted |
| Commit | 29de68c2b32ce58d64dea496d281e25ad0f551bd |
| Headers | show |
| Series | net: qrtr: free memory on error path in radix_tree_insert() | expand |
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 >
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: 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!
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; }
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> --- net/qrtr/ns.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)