* [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg()
@ 2025-02-25 2:14 Adrian Huang
2025-02-25 3:02 ` Joe Damato
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Adrian Huang @ 2025-02-25 2:14 UTC (permalink / raw)
To: Kuniyuki Iwashima, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni
Cc: Simon Horman, netdev, linux-kernel, Adrian Huang
From: Adrian Huang <ahuang12@lenovo.com>
After running the 'sendmsg02' program of Linux Test Project (LTP),
kmemleak reports the following memory leak:
# cat /sys/kernel/debug/kmemleak
unreferenced object 0xffff888243866800 (size 2048):
comm "sendmsg02", pid 67, jiffies 4294903166
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 5e 00 00 00 00 00 00 00 ........^.......
01 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
backtrace (crc 7e96a3f2):
kmemleak_alloc+0x56/0x90
kmem_cache_alloc_noprof+0x209/0x450
sk_prot_alloc.constprop.0+0x60/0x160
sk_alloc+0x32/0xc0
unix_create1+0x67/0x2b0
unix_create+0x47/0xa0
__sock_create+0x12e/0x200
__sys_socket+0x6d/0x100
__x64_sys_socket+0x1b/0x30
x64_sys_call+0x7e1/0x2140
do_syscall_64+0x54/0x110
entry_SYSCALL_64_after_hwframe+0x76/0x7e
Commit 689c398885cc ("af_unix: Defer sock_put() to clean up path in
unix_dgram_sendmsg().") defers sock_put() in the error handling path.
However, it fails to account for the condition 'msg->msg_namelen != 0',
resulting in a memory leak when the code jumps to the 'lookup' label.
Fix issue by calling sock_put() if 'msg->msg_namelen != 0' is met.
Fixes: 689c398885cc ("af_unix: Defer sock_put() to clean up path in unix_dgram_sendmsg().")
Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
---
Changelog v2:
- Per Kuniyuki's suggestion: Remove 'else' statement
---
net/unix/af_unix.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 34945de1fb1f..f0e613d97664 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2102,6 +2102,7 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg,
goto out_sock_put;
}
+ sock_put(other);
goto lookup;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg()
2025-02-25 2:14 [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg() Adrian Huang
@ 2025-02-25 3:02 ` Joe Damato
2025-02-25 19:09 ` Kuniyuki Iwashima
2025-02-27 3:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Joe Damato @ 2025-02-25 3:02 UTC (permalink / raw)
To: Adrian Huang
Cc: Kuniyuki Iwashima, David S . Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, netdev, linux-kernel, Adrian Huang
On Tue, Feb 25, 2025 at 10:14:57AM +0800, Adrian Huang wrote:
> From: Adrian Huang <ahuang12@lenovo.com>
>
> After running the 'sendmsg02' program of Linux Test Project (LTP),
> kmemleak reports the following memory leak:
>
> # cat /sys/kernel/debug/kmemleak
> unreferenced object 0xffff888243866800 (size 2048):
> comm "sendmsg02", pid 67, jiffies 4294903166
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 5e 00 00 00 00 00 00 00 ........^.......
> 01 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
> backtrace (crc 7e96a3f2):
> kmemleak_alloc+0x56/0x90
> kmem_cache_alloc_noprof+0x209/0x450
> sk_prot_alloc.constprop.0+0x60/0x160
> sk_alloc+0x32/0xc0
> unix_create1+0x67/0x2b0
> unix_create+0x47/0xa0
> __sock_create+0x12e/0x200
> __sys_socket+0x6d/0x100
> __x64_sys_socket+0x1b/0x30
> x64_sys_call+0x7e1/0x2140
> do_syscall_64+0x54/0x110
> entry_SYSCALL_64_after_hwframe+0x76/0x7e
>
> Commit 689c398885cc ("af_unix: Defer sock_put() to clean up path in
> unix_dgram_sendmsg().") defers sock_put() in the error handling path.
> However, it fails to account for the condition 'msg->msg_namelen != 0',
> resulting in a memory leak when the code jumps to the 'lookup' label.
>
> Fix issue by calling sock_put() if 'msg->msg_namelen != 0' is met.
>
> Fixes: 689c398885cc ("af_unix: Defer sock_put() to clean up path in unix_dgram_sendmsg().")
> Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
> ---
> Changelog v2:
> - Per Kuniyuki's suggestion: Remove 'else' statement
FYI according to netdev rules you should wait at least 24 hours
between repostings:
https://docs.kernel.org/process/maintainer-netdev.html#resending-after-review
That said:
Acked-by: Joe Damato <jdamato@fastly.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg()
2025-02-25 2:14 [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg() Adrian Huang
2025-02-25 3:02 ` Joe Damato
@ 2025-02-25 19:09 ` Kuniyuki Iwashima
2025-02-27 3:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Kuniyuki Iwashima @ 2025-02-25 19:09 UTC (permalink / raw)
To: adrianhuang0701
Cc: ahuang12, davem, edumazet, horms, kuba, kuniyu, linux-kernel,
netdev, pabeni
From: Adrian Huang <adrianhuang0701@gmail.com>
Date: Tue, 25 Feb 2025 10:14:57 +0800
> From: Adrian Huang <ahuang12@lenovo.com>
>
> After running the 'sendmsg02' program of Linux Test Project (LTP),
> kmemleak reports the following memory leak:
>
> # cat /sys/kernel/debug/kmemleak
> unreferenced object 0xffff888243866800 (size 2048):
> comm "sendmsg02", pid 67, jiffies 4294903166
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 5e 00 00 00 00 00 00 00 ........^.......
> 01 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
> backtrace (crc 7e96a3f2):
> kmemleak_alloc+0x56/0x90
> kmem_cache_alloc_noprof+0x209/0x450
> sk_prot_alloc.constprop.0+0x60/0x160
> sk_alloc+0x32/0xc0
> unix_create1+0x67/0x2b0
> unix_create+0x47/0xa0
> __sock_create+0x12e/0x200
> __sys_socket+0x6d/0x100
> __x64_sys_socket+0x1b/0x30
> x64_sys_call+0x7e1/0x2140
> do_syscall_64+0x54/0x110
> entry_SYSCALL_64_after_hwframe+0x76/0x7e
>
> Commit 689c398885cc ("af_unix: Defer sock_put() to clean up path in
> unix_dgram_sendmsg().") defers sock_put() in the error handling path.
> However, it fails to account for the condition 'msg->msg_namelen != 0',
> resulting in a memory leak when the code jumps to the 'lookup' label.
>
> Fix issue by calling sock_put() if 'msg->msg_namelen != 0' is met.
>
> Fixes: 689c398885cc ("af_unix: Defer sock_put() to clean up path in unix_dgram_sendmsg().")
> Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg()
2025-02-25 2:14 [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg() Adrian Huang
2025-02-25 3:02 ` Joe Damato
2025-02-25 19:09 ` Kuniyuki Iwashima
@ 2025-02-27 3:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-02-27 3:30 UTC (permalink / raw)
To: Adrian Huang
Cc: kuniyu, davem, edumazet, kuba, pabeni, horms, netdev,
linux-kernel, ahuang12
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 25 Feb 2025 10:14:57 +0800 you wrote:
> From: Adrian Huang <ahuang12@lenovo.com>
>
> After running the 'sendmsg02' program of Linux Test Project (LTP),
> kmemleak reports the following memory leak:
>
> # cat /sys/kernel/debug/kmemleak
> unreferenced object 0xffff888243866800 (size 2048):
> comm "sendmsg02", pid 67, jiffies 4294903166
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 5e 00 00 00 00 00 00 00 ........^.......
> 01 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
> backtrace (crc 7e96a3f2):
> kmemleak_alloc+0x56/0x90
> kmem_cache_alloc_noprof+0x209/0x450
> sk_prot_alloc.constprop.0+0x60/0x160
> sk_alloc+0x32/0xc0
> unix_create1+0x67/0x2b0
> unix_create+0x47/0xa0
> __sock_create+0x12e/0x200
> __sys_socket+0x6d/0x100
> __x64_sys_socket+0x1b/0x30
> x64_sys_call+0x7e1/0x2140
> do_syscall_64+0x54/0x110
> entry_SYSCALL_64_after_hwframe+0x76/0x7e
>
> [...]
Here is the summary with links:
- [v2,1/1] af_unix: Fix memory leak in unix_dgram_sendmsg()
https://git.kernel.org/netdev/net/c/bc23d4e30866
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-27 3:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-25 2:14 [PATCH v2 1/1] af_unix: Fix memory leak in unix_dgram_sendmsg() Adrian Huang
2025-02-25 3:02 ` Joe Damato
2025-02-25 19:09 ` Kuniyuki Iwashima
2025-02-27 3:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox