net: qrtr: fix memory leak in qrtr_local_enqueue
Subsystems (4)
PATCH 1/1 net: qrtr: fix memory leak in qrtr_local_enqueue
Syzbot reported memory leak in qrtr. The problem was in unputted struct sock. qrtr_local_enqueue() function calls qrtr_port_lookup() which takes sock reference if port was found. Then there is the following check:
if (!ipc || &ipc->sk == skb->sk) {
...
return -ENODEV;
}Since we should drop the reference before returning from this function and ipc can be non-NULL inside this if, we should add qrtr_port_put() inside this if.
--- net/qrtr/qrtr.c | 2 ++ 1 file changed, 2 insertions(+)
net/qrtr/qrtr.c +2 -0
@@ -839,6 +839,8 @@ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, ipc =qrtr_port_lookup (to->sq_port);if (!ipc || &ipc->sk == skb->sk) {/* do not send to self */ +if (ipc) +qrtr_port_put (ipc);kfree_skb (skb);return -ENODEV ; }
Signature · 1 line
2.32.0
Quoted 10 lines · Pavel Skripkin
Syzbot reported memory leak in qrtr. The problem was in unputted struct sock.
qrtr_local_enqueue()function callsqrtr_port_lookup()which takes sock reference if port was found. Then there is the following check:if (!ipc || &ipc->sk == skb->sk) { ... return -ENODEV; }
Quoted 7 lines
Since we should drop the reference before returning from this function and ipc can be non-NULL inside this if, we should add
qrtr_port_put()inside this if.Fixes bdabad3e363d ("net: Add Qualcomm IPC router")Reported-and-tested-by [email protected]Signed-off-by Pavel Skripkin <[email protected]>
It'd be good if this patch can be extended to fix one more corner case here:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/qrtr/qrtr.c#n522
Thanks,
Mani
Quoted 20 lines
--- net/qrtr/qrtr.c | 2 ++ 1 file changed, 2 insertions(+)net/qrtr/qrtr.c +2
-0@@ -839,6 +839,8 @@ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, ipc =qrtr_port_lookup (to->sq_port);if (!ipc || &ipc->sk == skb->sk) {/* do not send to self */ +if (ipc) +qrtr_port_put (ipc);kfree_skb (skb);return -ENODEV ; }Signature · 1 line
2.32.0
Quoted 20 lines · On Fri, 23 Jul 2021 17:57:53 +0530 Manivannan Sadhasivam <[email protected]>…
Quoted 10 lines · Pavel Skripkin
Syzbot reported memory leak in qrtr. The problem was in unputted struct sock.
qrtr_local_enqueue()function callsqrtr_port_lookup()which takes sock reference if port was found. Then there is the following check:if (!ipc || &ipc->sk == skb->sk) { ... return -ENODEV; }Quoted 8 lines
Since we should drop the reference before returning from this function and ipc can be non-NULL inside this if, we should add
qrtr_port_put()inside this if.Fixes bdabad3e363d ("net: Add Qualcomm IPC router")Reported-and-tested-by:
[email protected]Signed-off-by Pavel Skripkin <[email protected]>
Quoted 8 lines
Reviewed-by Manivannan Sadhasivam <[email protected]>It'd be good if this patch can be extended to fix one more corner case here:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/qrtr/qrtr.c#n522Thanks,
Mani
Hi, Manivannan!
I will fix leak there too in v2, thank you!
With regards,
Pavel Skripkin
Quoted 22 lines
Quoted 22 lines
--- net/qrtr/qrtr.c | 2 ++ 1 file changed, 2 insertions(+)net/qrtr/qrtr.c +2
-0@@ -839,6 +839,8 @@ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, ipc =qrtr_port_lookup (to->sq_port);if (!ipc || &ipc->sk == skb->sk) {/* do not send to self */ +if (ipc) +qrtr_port_put (ipc);kfree_skb (skb);return -ENODEV ;}
Signature · 1 line
2.32.0
PATCH v2 1/1 net: qrtr: fix memory leaks
In reply to Manivannan SadhasivamSyzbot reported memory leak in qrtr. The problem was in unputted struct sock. qrtr_local_enqueue() function calls qrtr_port_lookup() which takes sock reference if port was found. Then there is the following check:
if (!ipc || &ipc->sk == skb->sk) {
...
return -ENODEV;
}Since we should drop the reference before returning from this function and ipc can be non-NULL inside this if, we should add qrtr_port_put() inside this if.
The similar corner case is in qrtr_endpoint_post() as Manivannan reported. In case of sock_queue_rcv_skb() failure we need to put port reference to avoid leaking struct sock pointer.
---
Changes in v2:
Added missing qrtr_port_put() in qrtr_endpoint_post() as Manivannan reported.
--- net/qrtr/qrtr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/qrtr/qrtr.c +5 -1
@@ -514,8 +514,10 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)if (!ipc) goto err; -if (sock_queue_rcv_skb (&ipc->sk, skb)) +if (sock_queue_rcv_skb (&ipc->sk, skb)) { +qrtr_port_put (ipc); goto err; + }qrtr_port_put (ipc); }
@@ -850,6 +852,8 @@ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, ipc =qrtr_port_lookup (to->sq_port);if (!ipc || &ipc->sk == skb->sk) {/* do not send to self */ +if (ipc) +qrtr_port_put (ipc);kfree_skb (skb);return -ENODEV ; }
Signature · 1 line
2.32.0
Re: [PATCH v2] net: qrtr: fix memory leaks
Quoted 14 lines · Pavel Skripkin
Syzbot reported memory leak in qrtr. The problem was in unputted struct sock.
qrtr_local_enqueue()function callsqrtr_port_lookup()which takes sock reference if port was found. Then there is the following check:if (!ipc || &ipc->sk == skb->sk) { ... return -ENODEV; }Since we should drop the reference before returning from this function and ipc can be non-NULL inside this if, we should add
qrtr_port_put()inside this if.
Quoted 8 lines
The similar corner case is in
qrtr_endpoint_post()as Manivannan reported. In case ofsock_queue_rcv_skb()failure we need to put port reference to avoid leaking struct sock pointer.Fixes e04df98adf7d ("net: qrtr: Remove receive worker")Fixes bdabad3e363d ("net: Add Qualcomm IPC router")Reported-and-tested-by [email protected]Signed-off-by Pavel Skripkin <[email protected]>
Thanks,
Mani
Quoted 38 lines
---
Changes in v2:
Added missingqrtr_port_put()inqrtr_endpoint_post()as Manivannan reported.--- net/qrtr/qrtr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/qrtr/qrtr.c +5
-1@@ -514,8 +514,10 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)if (!ipc) goto err; -if (sock_queue_rcv_skb (&ipc->sk, skb)) +if (sock_queue_rcv_skb (&ipc->sk, skb)) { +qrtr_port_put (ipc); goto err; + }qrtr_port_put (ipc); }@@ -850,6 +852,8 @@ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, ipc =qrtr_port_lookup (to->sq_port);if (!ipc || &ipc->sk == skb->sk) {/* do not send to self */ +if (ipc) +qrtr_port_put (ipc);kfree_skb (skb);return -ENODEV ; }Signature · 1 line
2.32.0
Re: [PATCH v2] net: qrtr: fix memory leaks
In reply to Pavel SkripkinThis patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 11 lines · On Fri, 23 Jul 2021 18:31:32 +0300 you wrote:
Syzbot reported memory leak in qrtr. The problem was in unputted struct sock.
qrtr_local_enqueue()function callsqrtr_port_lookup()which takes sock reference if port was found. Then there is the following check:if (!ipc || &ipc->sk == skb->sk) { ... return -ENODEV; }[...]
Here is the summary with links:
- [v2] net: qrtr: fix memory leaks
https://git.kernel.org/netdev/net/c/52f3456a96c0
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html