summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLoic Poulain <loic.poulain@linaro.org>2021-03-30 16:11:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-14 08:47:19 +0200
commitcd090f3e5d56c283b43f3bb9d8c9ad896816e332 (patch)
tree3e62df725621094847a227065606a451a2bbb7eb /net
parentf61307f7b2bb7c6676c9e80212a0dd3462ba7439 (diff)
downloadlinux-cd090f3e5d56c283b43f3bb9d8c9ad896816e332.tar.gz
linux-cd090f3e5d56c283b43f3bb9d8c9ad896816e332.tar.bz2
linux-cd090f3e5d56c283b43f3bb9d8c9ad896816e332.zip
net: qrtr: Fix memory leak on qrtr_tx_wait failure
[ Upstream commit 8a03dd925786bdc3834d56ccc980bb70668efa35 ] qrtr_tx_wait does not check for radix_tree_insert failure, causing the 'flow' object to be unreferenced after qrtr_tx_wait return. Fix that by releasing flow on radix_tree_insert failure. Fixes: 5fdeb0d372ab ("net: qrtr: Implement outgoing flow control") Reported-by: syzbot+739016799a89c530b32a@syzkaller.appspotmail.com Signed-off-by: Loic Poulain <loic.poulain@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/qrtr/qrtr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index dfc820ee553a..1e4fb568fa84 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -271,7 +271,10 @@ static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_port,
flow = kzalloc(sizeof(*flow), GFP_KERNEL);
if (flow) {
init_waitqueue_head(&flow->resume_tx);
- radix_tree_insert(&node->qrtr_tx_flow, key, flow);
+ if (radix_tree_insert(&node->qrtr_tx_flow, key, flow)) {
+ kfree(flow);
+ flow = NULL;
+ }
}
}
mutex_unlock(&node->qrtr_tx_lock);