WARNING: refcount bug in sk_psock_get (2)
Subsystems (8)
syzbot
syzbotHello,
syzbot found the following issue on:
HEAD commit: 7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.. git tree: net-next console+strace: https://syzkaller.appspot.com/x/log.txt?x=13e2c083f00000 kernel config: https://syzkaller.appspot.com/x/.config?x=e2c9c27babb4d679 dashboard link: https://syzkaller.appspot.com/bug?extid=5f26f85569bd179c18ce compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16f2520bf00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=13c31fcbf00000
The issue was bisected to:
commit 341adeec9adad0874f29a0a1af35638207352a39
Author: Wen Gu <[email protected]> Date: Wed Jan 26 15:33:04 2022 +0000
net/smc: Forward wakeup to smc socket waitqueue after fallback
bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=12eb9635f00000 final oops: https://syzkaller.appspot.com/x/report.txt?x=11eb9635f00000 console output: https://syzkaller.appspot.com/x/log.txt?x=16eb9635f00000
IMPORTANT: if you fix the issue, please add the following tag to the commit:
netdevsim netdevsim0 netdevsim3: set [1, 0] type 2 family 0 port 6081 - 0
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Code: 1d 58 b1 ac 09 31 ff 89 de e8 38 3d 80 fd 84 db 75 ab e8 4f 39 80 fd 48 c7 c7 e0 a3 27 8a c6 05 38 b1 ac 09 01 e8 62 c6 34 05 <0f> 0b eb 8f e8 33 39 80 fd 0f b6 1d 22 b1 ac 09 31 ff 89 de e8 03 RSP: 0018:ffffc90002fcf9d0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888022543b00 RSI: ffffffff81606db8 RDI: fffff520005f9f2c RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff816000f9 R11: 0000000000000000 R12: 1ffff920005f9f3d R13: 0000000090965601 R14: ffff88807e9a0000 R15: ffffc90002fcfa08 FS: 00005555567fa300(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fd252aa4300 CR3: 000000001994e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7fbd68c61969 Code: 28 c3 e8 4a 15 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffdfd5f2358 EFLAGS: 00000246 ORIG_RAX: 0000000000000030 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fbd68c61969 RDX: 00007fbd68c61969 RSI: 0000000000000001 RDI: 0000000000000003 RBP: 0000000000000003 R08: bb1414ac00000000 R09: bb1414ac00000000 R10: 0000000000000028 R11: 0000000000000246 R12: 00007ffdfd5f2370 R13: 00007ffdfd5f2364 R14: 0000000000000003 R15: 0000000000000000 </TASK>
---
This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at [email protected].
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection
syzbot can test patches for this issue, for details see:
https://goo.gl/tpsmEJ#testing-patches
PATCH 1/1 smc: fix refcount bug in sk_psock_get (2)
From: hawk <[email protected]>
Syzkaller reportes refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 ... Call Trace: <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
syzbot is try to setup TLS on a SMC socket.
During SMC fallback process in connect syscall, kernel will sets the smc->sk.sk_socket->file->private_data to smc->clcsock
in smc_switch_to_fallback(), and set smc->clcsock->sk_user_data to origin smc in smc_fback_replace_callbacks().
When syzbot makes a setsockopt syscall, its argument sockfd actually points to smc->clcsock, which is not a smc_sock type, So it won't call smc_setsockopt() in setsockopt syscall, instead it will call do_tcp_setsockopt() to setup TLS, which bypasses the fixes 734942cc4ea6, its content is shown as below
Quoted 23 lines
net/smc/af_smc.c +3
-0@@ -2161,6 +2161,9 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, struct smc_sock *smc;int val, rc; +if (level ==SOL_TCP && optname ==TCP_ULP ) +return -EOPNOTSUPP ; + smc =smc_sk (sk);net/smc/af_smc.c +0
-1/* generic setsockopts reaching us here always apply to the @@ -2185,7 +2188,6 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, if (rc || smc->use_fallback) goto out;switch (optname) { -case TCP_ULP :case TCP_FASTOPEN :case TCP_FASTOPEN_CONNECT :
Quoted 2 lines
case
TCP_FASTOPEN_KEY:
--
Later, sk_psock_get() will treat the smc->clcsock->sk_user_data as sk_psock type, which triggers the refcnt warning.
So Just disallow this setup in do_tcp_setsockopt() is OK, by checking whether sk_user_data points to a SMC socket.
--- net/ipv4/tcp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/ipv4/tcp.c +13 -0
@@ -3395,10 +3395,23 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, }case TCP_ULP : {char name[TCP_ULP_NAME_MAX ]; +struct sock *smc_sock;if (optlen <1 )return -EINVAL ; +/* SMC sk_user_data may be treated as psock, +* which triggers a refcnt warning. +*/ +rcu_read_lock (); + smc_sock =rcu_dereference_sk_user_data (sk); +if (level ==SOL_TCP && smc_sock && + smc_sock->__sk_common.skc_family ==AF_SMC ) { +rcu_read_unlock (); +return -EOPNOTSUPP ; + } +rcu_read_unlock (); + val =strncpy_from_sockptr (name, optval,min_t (long,TCP_ULP_NAME_MAX -1 , optlen));
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Jakub Kicinski
maintainerRe: [PATCH] smc: fix refcount bug in sk_psock_get (2)
Quoted 16 lines · On Sat, 9 Jul 2022 10:46:59 +0800 Hawkins Jiawei wrote:
Reported-and-tested-by [email protected]Signed-off-by hawk <[email protected]>--- net/ipv4/tcp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)net/ipv4/tcp.c +1
-0@@ -3395,10 +3395,23 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, }case TCP_ULP : {char name[TCP_ULP_NAME_MAX ]; +struct sock *smc_sock;
net/ipv4/tcp.c static int do_tcp_setsockopt(struct sock *sk, int level, int optname, · line 3409
Quoted 10 lines
net/ipv4/tcp.c +7
-0if (optlen <1 )return -EINVAL ; +/* SMC sk_user_data may be treated as psock, +* which triggers a refcnt warning. +*/ +rcu_read_lock (); + smc_sock =rcu_dereference_sk_user_data (sk); +if (level ==SOL_TCP && smc_sock && + smc_sock->__sk_common.skc_family ==AF_SMC ) {
This should prolly be under the socket lock?
Can we add a bit to SK_USER_DATA_PTRMASK and have ULP-compatible users (sockmap) opt into ULP cooperation? Modifying TCP is backwards, layer-wise.
Quoted 5 lines
net/ipv4/tcp.c +5
-0+rcu_read_unlock (); +return -EOPNOTSUPP ; + } +rcu_read_unlock (); +
Re: [PATCH] smc: fix refcount bug in sk_psock_get (2)
Quoted 30 lines · Jakub Kicinski
Quoted 16 lines · On Sat, 9 Jul 2022 10:46:59 +0800 Hawkins Jiawei wrote:
Reported-and-tested-by [email protected]Signed-off-by hawk <[email protected]>--- net/ipv4/tcp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)net/ipv4/tcp.c +1
-0@@ -3395,10 +3395,23 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname, }case TCP_ULP : {char name[TCP_ULP_NAME_MAX ]; +struct sock *smc_sock;net/ipv4/tcp.c static int do_tcp_setsockopt(struct sock *sk, int level, int optname, · line 3409
Quoted 10 lines
net/ipv4/tcp.c +7
-0if (optlen <1 )return -EINVAL ; +/* SMC sk_user_data may be treated as psock, +* which triggers a refcnt warning. +*/ +rcu_read_lock (); + smc_sock =rcu_dereference_sk_user_data (sk); +if (level ==SOL_TCP && smc_sock && + smc_sock->__sk_common.skc_family ==AF_SMC ) {This should prolly be under the socket lock?
Quoted 3 lines
Can we add a bit to
SK_USER_DATA_PTRMASKand have ULP-compatible users (sockmap) opt into ULP cooperation? Modifying TCP is backwards, layer-wise.
Thanks for your suggestion, I also agree that modifying TCP directly is not wise.
I am sorry that I can't follow you on haveing ULP-compatible users (sockmap) opt into ULP cooperation, yet adding a bit to SK_USER_DATA_PTRMASK seems like a good way.
I plan to add a mask bit, and check it during sk_psock_get(), in v2 patch
Quoted 6 lines
Quoted 6 lines
net/ipv4/tcp.c +5
-0+rcu_read_unlock (); +return -EOPNOTSUPP ; + } +rcu_read_unlock (); +
Wen Gu
reviewerRe: [PATCH] smc: fix refcount bug in sk_psock_get (2)
In reply to Hawkins JiaweiQuoted 12 lines · Hawkins Jiawei
syzbot is try to setup TLS on a SMC socket.
During SMC fallback process in connect syscall, kernel will sets the
smc->sk.sk_socket->file->private_datatosmc->clcsock
insmc_switch_to_fallback(), and setsmc->clcsock->sk_user_datato origin smc insmc_fback_replace_callbacks().Later,
sk_psock_get()will treat thesmc->clcsock->sk_user_dataassk_psocktype, which triggers the refcnt warning.
Thanks for your analysis.
Although syzbot found this issue in SMC, seems that it is a generic issue about sk_user_data usage? Fixing it from SK_USER_DATA_PTRMASK as you plan should be a right way.
Re: [PATCH] smc: fix refcount bug in sk_psock_get (2)
In reply to Hawkins JiaweiQuoted 1 line · Hawkins Jiawei
From: hawk <[email protected]>
Please use your legal name like you would for signing a legal document.
regards,
dan carpenter
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH] smc: fix refcount bug in sk_psock_get (2)
In reply to Wen GuQuoted 3 lines · Wen Gu
Although syzbot found this issue in SMC, seems that it is a generic issue about
sk_user_datausage? Fixing it fromSK_USER_DATA_PTRMASKas you plan should be a right way.
Thanks for your advice. In fact, I found a more
general patch, but it seems that it has not
been merged until now.
In this bug, the problem is that smc and psock, both use sk_user_data field to save their private data. So they will treat field in their own way.
Quoted 5 lines
Quoted 5 lines
in
smc_switch_to_fallback(), and setsmc->clcsock->sk_user_datato origin smc insmc_fback_replace_callbacks().Later,
sk_psock_get()will treat thesmc->clcsock->sk_user_dataassk_psocktype, which triggers the refcnt warning.
So in the patch [PATCH RFC 1/5] net: Add distinct sk_psock field, psock private data will be moved to the sk_psock field, shown as below
Quoted 96 lines
The
sk_psockfacility populates thesk_user_datafield with the address of an extra bit of metadata. User space sockets never populate thesk_user_datafield, so this has worked out fine.However, kernel consumers such as the RPC client and server do populate the
sk_user_datafield. Thesk_psock()function cannot tell that the content ofsk_user_datadoes not point to psock metadata, so it will happily return a pointer to something else, cast to a structsk_psock.Thus kernel consumers and psock currently cannot co-exist.
We could educate
sk_psock()to return NULL ifsk_user_datadoes not point to a structsk_psock. However, a more general solution that enables full co-existence psock and other uses ofsk_user_datamight be more interesting.Move the struct
sk_psockaddress to its own pointer field so that the contents of thesk_user_datafield is preserved.Signed-off-by Chuck Lever <[email protected]>--- include/linux/skmsg.h | 2 +- include/net/sock.h | 4 +++- net/core/skmsg.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-)include/linux/skmsg.h +1
-1@@ -277,7 +277,7 @@ static inline void sk_msg_sg_copy_clear( struct sk_msg *msg, u32 start)static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return rcu_dereference (sk->sk_psock); }static inline void sk_psock_set_state(struct
sk_psock*psock,include/net/sock.h +3
-1@@ -327,7 +327,8 @@ struct sk_filter;* @sk_tskey: counter to disambiguate concurrent tstamp requests * @sk_zckey: counter to order MSG_ZEROCOPY notifications * @sk_socket: Identd and reporting IO signals -* @sk_user_data: RPC layer private data +* @sk_user_data: Upper layer private data +* @sk_psock: socket policy data (bpf) * @sk_frag: cached page frag * @sk_peek_off: current peek_offset value * @sk_send_head: front of stuff to transmit @@ -519,6 +520,7 @@ struct sock {struct socket *sk_socket;void *sk_user_data; +struct sk_psock __rcu *sk_psock;#ifdef CONFIG_SECURITY void *sk_security;#endif net/core/skmsg.c +1
-1@@ -695,7 +695,7 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node) write_lock_bh(&sk->sk_callback_lock); -if (sk->sk_user_data) { +if (sk->sk_psock) { psock =ERR_PTR (-EBUSY ); goto out;net/core/skmsg.c +1
-1}@@ -726,7 +726,7 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)sk_psock_set_state (psock ,SK_PSOCK_TX_ENABLED );refcount_set (&psock->refcnt,1 ); -rcu_assign_sk_user_data_nocopy (sk, psock); +rcu_assign_pointer (sk->sk_psock, psock);sock_hold (sk);out:
net/core/skmsg.c +1
-1@@ -825,7 +825,7 @@ void sk_psock_drop(struct sock *sk, struct sk_psock *psock) {write_lock_bh (&sk->sk_callback_lock);sk_psock_restore_proto (sk, psock); -rcu_assign_sk_user_data (sk,NULL ); +rcu_assign_pointer (sk->sk_psock,NULL );if (psock->progs.stream_parser)sk_psock_stop_strp (sk, psock);
Quoted 1 line
else if (
psock->progs.stream_verdict||psock->progs.skb_verdict)
I have tested this patch and the reproducer did not trigger any issue.
In Patchwork website, this patch fails the checks on netdev/cc_maintainers. If this patch fails for some other reasons, I will still fix this bug from SK_USER_DATA_PTRMASK,
as a temporary solution.
_______________________________________________
Linux-kernel-mentees mailing list [email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Jakub Kicinski
maintainerRe: [PATCH] smc: fix refcount bug in sk_psock_get (2)
Quoted 4 lines · On Wed, 13 Jul 2022 11:10:05 +0800 Hawkins Jiawei wrote:
In Patchwork website, this patch fails the checks on netdev/cc_maintainers. If this patch fails for some other reasons, I will still fix this bug from
SK_USER_DATA_PTRMASK,
as a temporary solution.
That check just runs scripts/get_maintainer.pl so make sure you CC folks pointed out by that script and you should be fine.
Re: [PATCH] smc: fix refcount bug in sk_psock_get (2)
In reply to Dan CarpenterQuoted 5 lines · Dan Carpenter
Quoted 1 line · Hawkins Jiawei
From: hawk <[email protected]>
Please use your legal name like you would for signing a legal document.
Thanks, I will pay attention to it in the future.
Quoted 4 lines
regards,
dan carpenter
Re: [PATCH] smc: fix refcount bug in sk_psock_get (2)
In reply to Jakub KicinskiQuoted 9 lines · Jakub Kicinski
Quoted 4 lines · On Wed, 13 Jul 2022 11:10:05 +0800 Hawkins Jiawei wrote:
In Patchwork website, this patch fails the checks on netdev/cc_maintainers. If this patch fails for some other reasons, I will still fix this bug from
SK_USER_DATA_PTRMASK,
as a temporary solution.That check just runs
scripts/get_maintainer.plso make sure you CC folks pointed out by that script and you should be fine.
Thanks for your reply, yet I am not the patch's author, I found this patch during my bug analysis.
I will reply the relative email to remind the patch's author.
PATCH v2 1/1 net/smc: fix refcount bug in sk_psock_get (2)
In reply to syzbotSyzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 ... Call Trace: <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets clcsk->sk_user_data to origin smc socket in smc_fback_replace_callbacks().
Later, in shutdown syscall, kernel will calls sk_psock_get(), which treats the clcsk->sk_user_data as sk_psock type, triggering the refcnt warning.
So, the root cause is that smc and psock, both will use sk_user_data field. So they will mismatch this field easily.
This patch solves it by using another bit(defined as SK_USER_DATA_NOTPSOCK) in PTRMASK, to mark whether sk_user_data points to a sk_psock object or not.
This patch depends on a PTRMASK introduced in commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").
---
v1 -> v2:
- add bit in PTRMASK to patch the bug
include/linux/skmsg.h | 2 +- include/net/sock.h | 27 +++++++++++++++++++++++++-- net/smc/af_smc.c | 6 ++++-- net/smc/smc.h | 2 +- 4 files changed, 31 insertions(+), 6 deletions(-)
include/linux/skmsg.h +1 -1
@@ -277,7 +277,7 @@ static inline void sk_msg_sg_copy_clear(struct sk_msg *msg, u32 start)static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return rcu_dereference_sk_user_data_psock (sk); } static inline void sk_psock_set_state(struct sk_psock *psock,
include/net/sock.h +25 -2
@@ -549,10 +549,17 @@ enum sk_pacing {* when cloning the socket. For instance, it can point to a reference * counted object. sk_user_data bottom bit is set if pointer must not * be copied. +* +* SK_USER_DATA_NOCOPY - test if pointer must not copied +* SK_USER_DATA_BPF - managed by BPF +* SK_USER_DATA_NOTPSOCK - test if pointer points to psock */ #define SK_USER_DATA_NOCOPY 1UL -#define SK_USER_DATA_BPF 2UL/* Managed by BPF */ -#define SK_USER_DATA_PTRMASK ~(SK_USER_DATA_NOCOPY | SK_USER_DATA_BPF) +#define SK_USER_DATA_BPF 2UL +#define SK_USER_DATA_NOTPSOCK 4UL +#define SK_USER_DATA_PTRMASK ~(SK_USER_DATA_NOCOPY | SK_USER_DATA_BPF |\ + SK_USER_DATA_NOTPSOCK) +/** * sk_user_data_is_nocopy - Test if sk_user_data pointer must not be copied
@@ -584,6 +591,22 @@ static inline bool sk_user_data_is_nocopy(const struct sock *sk) __tmp | SK_USER_DATA_NOCOPY); \ }) +/** +* rcu_dereference_sk_user_data_psock - return psock if sk_user_data points +* to the psock +* @sk: socket +*/ +static inline +struct sk_psock *rcu_dereference_sk_user_data_psock (const struct sock *sk) +{ +uintptr_t __tmp = (uintptr_t )rcu_dereference (__sk_user_data ((sk))); + +if (__tmp &SK_USER_DATA_NOTPSOCK ) +return NULL ; +return (struct sk_psock *)(__tmp &SK_USER_DATA_PTRMASK ); +} + +static inline struct net *sock_net (const struct sock *sk) {
net/smc/af_smc.c +4 -2
@@ -812,7 +812,8 @@ static void smc_fback_replace_callbacks(struct smc_sock *smc)struct sock *clcsk = smc->clcsock->sk;write_lock_bh (&clcsk->sk_callback_lock); - clcsk->sk_user_data = (void *)((uintptr_t )smc |SK_USER_DATA_NOCOPY ); + clcsk->sk_user_data = (void *)((uintptr_t )smc |SK_USER_DATA_NOCOPY | +SK_USER_DATA_NOTPSOCK );smc_clcsock_replace_cb (&clcsk->sk_state_change, smc_fback_state_change, &smc->clcsk_state_change);
@@ -2470,7 +2471,8 @@ static int smc_listen(struct socket *sock, int backlog)*/ write_lock_bh (&smc->clcsock->sk->sk_callback_lock); smc->clcsock->sk->sk_user_data = - (void *)((uintptr_t )smc |SK_USER_DATA_NOCOPY ); + (void *)((uintptr_t )smc |SK_USER_DATA_NOCOPY | +SK_USER_DATA_NOTPSOCK );smc_clcsock_replace_cb (&smc->clcsock->sk->sk_data_ready, smc_clcsock_data_ready, &smc->clcsk_data_ready);write_unlock_bh (&smc->clcsock->sk->sk_callback_lock);
net/smc/smc.h +1 -1
@@ -299,7 +299,7 @@ static inline void smc_init_saved_callbacks(struct smc_sock *smc)static inline struct smc_sock *smc_clcsock_user_data (const struct sock *clcsk) {return (struct smc_sock *) - ((uintptr_t )clcsk->sk_user_data & ~SK_USER_DATA_NOCOPY ); + ((uintptr_t )clcsk->sk_user_data &SK_USER_DATA_PTRMASK ); }/* save target_cb in saved_cb, and replace target_cb with new_cb */
Signature · 1 line
2.25.1
Jakub Sitnicki
maintainerRe: [PATCH v2] net/smc: fix refcount bug in sk_psock_get (2)
Hi,
Quoted 53 lines · Hawkins Jiawei
Syzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 ... Call Trace: <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets
clcsk->sk_user_datato origin smc socket insmc_fback_replace_callbacks().Later, in shutdown syscall, kernel will calls
sk_psock_get(), which treats theclcsk->sk_user_dataassk_psocktype, triggering the refcnt warning.So, the root cause is that smc and psock, both will use
sk_user_datafield. So they will mismatch this field easily.This patch solves it by using another
bit(defined as SK_USER_DATA_NOTPSOCK)in PTRMASK, to mark whethersk_user_datapoints to ask_psockobject or not.
This patch depends on a PTRMASK introduced in commitf1ff5ce2cd5e("net,sk_msg: Clearsk_user_datapointer on clone if tagged").
Quoted 7 lines
Fixes 341adeec9ada ("net/smc: Forward wakeup to smc socket waitqueue after fallback")Fixes a60a2b1e0af1 ("net/smc: reduce active tcp_listen workers")Reported-and-tested-by [email protected]Suggested-by Jakub Kicinski <[email protected]>Acked-by Wen Gu <[email protected]>Signed-off-by Hawkins Jiawei <[email protected]>---
Since using psock is not the common case, I'm wondering if it makes more sense to have an inverse flag - SK_USER_DATA_PSOCK. Flag would be set by the psock code on assignment to sk_user_data.
This way we would also avoid some confusion. With the change below, the SK_USER_DATA_NOTPSOCK is not *always* set when sk_user_data holds a non-psock pointer. Only when SMC sets it.
If we go with the current approach, the rest of sites, execpt for psock, that assign to sk_user_data should be updated to set SK_USER_DATA_NOTPSOCK as well, IMO.
That is why I'd do it the other way.
[...]
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH v2] net/smc: fix refcount bug in sk_psock_get (2)
Thanks for your suggestion!
Quoted 7 lines · Jakub Sitnicki
This way we would also avoid some confusion. With the change below, the
SK_USER_DATA_NOTPSOCKis not *always* set whensk_user_dataholds a non-psock pointer. Only when SMC sets it.If we go with the current approach, the rest of sites, execpt for psock, that assign to
sk_user_datashould be updated to setSK_USER_DATA_NOTPSOCKas well, IMO.
Yes, as you point out, in this patch, this flag's name should be *SK_USER_DATA_NEEDCHECK_NOTPSOCK*, which is more clearly.
To be more specific, we don't need to set this flag for every sk_user_data who holds non-psock pointer. Only set the flag for the site that has been reported involved with the type-mismatch bug like this bug.
Quoted 9 lines
Quoted 9 lines
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets
clcsk->sk_user_datato origin smc socket insmc_fback_replace_callbacks().Later, in shutdown syscall, kernel will calls
sk_psock_get(), which treats theclcsk->sk_user_dataassk_psocktype, triggering the refcnt warning.
For other sites, this patch is actually transparent to them, because the *SK_USER_DATA_NEEDCHECK_NOTPSOCK* flag is always unset. So this patch won't affect them, which won't introduce any extra potential bugs.
Quoted 16 lines
include/net/sock.h +14
-0+/** +* rcu_dereference_sk_user_data_psock - return psock if sk_user_data points +* to the psock +* @sk: socket +*/ +static inline +struct sk_psock *rcu_dereference_sk_user_data_psock (const struct sock *sk) +{ +uintptr_t __tmp = (uintptr_t )rcu_dereference (__sk_user_data ((sk))); + +if (__tmp &SK_USER_DATA_NOTPSOCK ) +return NULL ; +return (struct sk_psock *)(__tmp &SK_USER_DATA_PTRMASK ); +}
Quoted 4 lines
Hi,
Since using psock is not the common case, I'm wondering if it makes more sense to have an inverse flag -SK_USER_DATA_PSOCK. Flag would be set by the psock code on assignment tosk_user_data.
However, your suggestion seems more elegant. For my patch, as you point out, when anyone reports a new type-mismatch bug, the relative assign to sk_user_data should be updated to set *SK_USER_DATA_NEEDCHECK_NOTPSOCK* flag.
For your suggestion, you seems avoid above situation. What's more, as I use git grep to search, there seems no direct access to sk_user_data, all via a small amount macros and wrapper functions. So we can keep transparent by only update those macros and wrapper functions, which also won't introduce any extra potential bugs.
I will patch as you suggest in v3 patch.
PATCH v3 1/1 net/smc: fix refcount bug in sk_psock_get (2)
In reply to syzbotSyzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets clcsk->sk_user_data to origin smc socket in smc_fback_replace_callbacks().
Later, in shutdown syscall, kernel will calls sk_psock_get(), which treats the clcsk->sk_user_data as psock type, triggering the refcnt warning.
So, the root cause is that smc and psock, both will use sk_user_data field. So they will mismatch this field easily.
This patch solves it by using another bit(defined as SK_USER_DATA_PSOCK) in PTRMASK, to mark whether sk_user_data points to a psock object or not.
This patch depends on a PTRMASK introduced in commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").
---
v2 -> v3:
- use SK_USER_DATA_PSOCK instead of SK_USER_DATA_NOTPSOCK
to patch the bug
- refactor the code on assigning to sk_user_data field
in psock part
- refactor the code on getting and setting the flag
with sk_user_data field
v1 -> v2:
- add bit in PTRMASK to patch the bug
include/linux/skmsg.h | 2 +- include/net/sock.h | 58 +++++++++++++++++++++++++++++++------------ net/core/skmsg.c | 3 ++- 3 files changed, 45 insertions(+), 18 deletions(-)
include/linux/skmsg.h +1 -1
@@ -277,7 +277,7 @@ static inline void sk_msg_sg_copy_clear(struct sk_msg *msg, u32 start)static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return rcu_dereference_sk_user_data_psock (sk); } static inline void sk_psock_set_state(struct sk_psock *psock,
include/net/sock.h +42 -16
74 lines not on this page · raw message
net/core/skmsg.c +2 -1
@@ -735,7 +735,8 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)sk_psock_set_state (psock,SK_PSOCK_TX_ENABLED );refcount_set (&psock->refcnt,1 ); -rcu_assign_sk_user_data_nocopy (sk, psock); +rcu_assign_sk_user_data_with_flags (sk, psock,SK_USER_DATA_NOCOPY | +SK_USER_DATA_PSOCK );sock_hold (sk); out:
Signature · 1 line
2.25.1
Wen Gu
reviewerRe: [PATCH v3] net/smc: fix refcount bug in sk_psock_get (2)
Quoted 64 lines · Hawkins Jiawei
Syzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets
clcsk->sk_user_datato origin smc socket insmc_fback_replace_callbacks().Later, in shutdown syscall, kernel will calls
sk_psock_get(), which treats theclcsk->sk_user_dataas psock type, triggering the refcnt warning.So, the root cause is that smc and psock, both will use
sk_user_datafield. So they will mismatch this field easily.This patch solves it by using another
bit(defined as SK_USER_DATA_PSOCK)in PTRMASK, to mark whethersk_user_datapoints to a psock object or not.
This patch depends on a PTRMASK introduced in commitf1ff5ce2cd5e("net,sk_msg: Clearsk_user_datapointer on clone if tagged").Reported-and-tested-by [email protected]Suggested-by Jakub Kicinski <[email protected]>Acked-by Wen Gu <[email protected]>Signed-off-by Hawkins Jiawei <[email protected]>---
v2 -> v3:
- useSK_USER_DATA_PSOCKinstead ofSK_USER_DATA_NOTPSOCK
to patch the bug
- refactor the code on assigning tosk_user_datafield
in psock part
- refactor the code on getting and setting the flag
withsk_user_datafield
Quoted 8 lines
v1 -> v2:
- add bit in PTRMASK to patch the buginclude/linux/skmsg.h | 2 +- include/net/sock.h | 58 +++++++++++++++++++++++++++++++------------ net/core/skmsg.c | 3 ++- 3 files changed, 45 insertions(+), 18 deletions(-)
Hi Hawkins,
Since the fix v3 doesn't involved smc codes any more, I wonder if it's still appropriate to use 'net/smc:' in subject?
Cheers,
Wen Gu
PATCH v3 1/1 net/smc: fix refcount bug in sk_psock_get (2)
Quoted 7 lines · Wen Gu
Hi Hawkins,
Since the fix v3 doesn't involved smc codes any more, I wonder if it's still appropriate to use 'net/smc:' in subject?
Cheers,
Wen Gu
Thank you for reminding me, I will send the v4 patch with new subject.
PATCH v4 1/1 net: fix refcount bug in sk_psock_get (2)
In reply to syzbotSyzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets clcsk->sk_user_data to origin smc socket in smc_fback_replace_callbacks().
Later, in shutdown syscall, kernel will calls sk_psock_get(), which treats the clcsk->sk_user_data as psock type, triggering the refcnt warning.
So, the root cause is that smc and psock, both will use sk_user_data field. So they will mismatch this field easily.
This patch solves it by using another bit(defined as SK_USER_DATA_PSOCK) in PTRMASK, to mark whether sk_user_data points to a psock object or not.
This patch depends on a PTRMASK introduced in commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").
---
v3 -> v4:
- change new subject
- fix diff content, which has been edit accidentally
v2 -> v3:
- use SK_USER_DATA_PSOCK instead of SK_USER_DATA_NOTPSOCK
to patch the bug
- refactor the code on assigning to sk_user_data field
in psock part
- refactor the code on getting and setting the flag
with sk_user_data field
v1 -> v2:
- add bit in PTRMASK to patch the bug
include/linux/skmsg.h | 2 +- include/net/sock.h | 58 +++++++++++++++++++++++++++++++------------ net/core/skmsg.c | 3 ++- 3 files changed, 45 insertions(+), 18 deletions(-)
include/linux/skmsg.h +1 -1
@@ -277,7 +277,7 @@ static inline void sk_msg_sg_copy_clear(struct sk_msg *msg, u32 start)static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return rcu_dereference_sk_user_data_psock (sk); } static inline void sk_psock_set_state(struct sk_psock *psock,
include/net/sock.h +42 -16
75 lines not on this page · raw message
net/core/skmsg.c +2 -1
@@ -735,7 +735,8 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)sk_psock_set_state (psock,SK_PSOCK_TX_ENABLED );refcount_set (&psock->refcnt,1 ); -rcu_assign_sk_user_data_nocopy (sk, psock); +rcu_assign_sk_user_data_with_flags (sk, psock,SK_USER_DATA_NOCOPY | +SK_USER_DATA_PSOCK );sock_hold (sk); out:
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerRe: [PATCH v4] net: fix refcount bug in sk_psock_get (2)
Review
Quoted 12 lines · On Wed, 3 Aug 2022 20:41:22 +0800 Hawkins Jiawei wrote:
(quoted diff) +8
-4-/* Pointer stored in sk_user_data might not be suitable for copying - * when cloning the socket. For instance, it can point to a reference - * counted object. sk_user_data bottom bit is set if pointer must not - * be copied. +/* flag bits in sk_user_data + * + * SK_USER_DATA_NOCOPY - Pointer stored in sk_user_data might + * not be suitable for copying when cloning the socket. + * For instance, it can point to a reference counted object. + * sk_user_data bottom bit is set if pointer must not be copied. + * + * SK_USER_DATA_BPF - Managed by BPF
I'd use this opportunity to add more info here, BPF is too general. Maybe "Pointer is used by a BPF reuseport array"? Martin, WDYT?
Review
Quoted 13 lines
+ *
SK_USER_DATA_PSOCK- Mark whether pointer stored insk_user_datapoints
+ * to psock type. This bit should be set whensk_user_datais
+ * assigned to a psock object.(quoted diff) +9
-0+/** + * rcu_dereference_sk_user_data_psock - return psock if sk_user_data + * points to the psock type(SK_USER_DATA_PSOCK flag is set), otherwise + * return NULL + * + * @sk: socket + */ +static inline +struct sk_psock *rcu_dereference_sk_user_data_psock(const struct sock *sk)
nit: the return type more commonly goes on the same line as "static inline"
Review
Quoted 8 lines
(quoted diff) +8
-0+{ + uintptr_t __tmp = (uintptr_t)rcu_dereference(__sk_user_data((sk))); + + if (__tmp & SK_USER_DATA_PSOCK) + return (struct sk_psock *)(__tmp & SK_USER_DATA_PTRMASK); + + return NULL; +}
As a follow up we can probably generalize this into
__rcu_dereference_sk_user_data_cond(sk, bit)
and make the psock just call that:
static inline struct sk_psock * rcu_dereference_sk_user_data_psock(const struct sock *sk)
{
return __rcu_dereference_sk_user_data_cond(sk, SK_USER_DATA_PSOCK);
}then reuseport can also benefit, maybe:
kernel/bpf/reuseport_array.c +3 -6
@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map)/* The caller must hold the reuseport_lock */ void bpf_sk_reuseport_detach (struct sock *sk) { -uintptr_t sk_user_data; +struct sock __rcu **socks;write_lock_bh (&sk->sk_callback_lock); - sk_user_data = (uintptr_t )sk->sk_user_data; -if (sk_user_data &SK_USER_DATA_BPF ) { -struct sock __rcu **socks; - - socks = (void *)(sk_user_data &SK_USER_DATA_PTRMASK ); + socks =__rcu_dereference_sk_user_data_cond (sk,SK_USER_DATA_BPF ); +if (socks) {WRITE_ONCE (sk->sk_user_data,NULL );/* * Do not move this NULL assignment outside of
But that must be a separate patch, not part of this fix.
Re: [PATCH v4] net: fix refcount bug in sk_psock_get (2)
Quoted 16 lines · Jakub Kicinski
Review
Quoted 12 lines · On Wed, 3 Aug 2022 20:41:22 +0800 Hawkins Jiawei wrote:
(quoted diff) +8
-4-/* Pointer stored in sk_user_data might not be suitable for copying - * when cloning the socket. For instance, it can point to a reference - * counted object. sk_user_data bottom bit is set if pointer must not - * be copied. +/* flag bits in sk_user_data + * + * SK_USER_DATA_NOCOPY - Pointer stored in sk_user_data might + * not be suitable for copying when cloning the socket. + * For instance, it can point to a reference counted object. + * sk_user_data bottom bit is set if pointer must not be copied. + * + * SK_USER_DATA_BPF - Managed by BPFI'd use this opportunity to add more info here, BPF is too general. Maybe "Pointer is used by a BPF reuseport array"? Martin, WDYT?
SGTM. Thanks.
Re: [PATCH v4] net: fix refcount bug in sk_psock_get (2)
Quoted 5 lines · Martin KaFai Lau
Quoted 4 lines
Quoted 1 line
+ *
SK_USER_DATA_BPF- Managed by BPFI'd use this opportunity to add more info here, BPF is too general. Maybe "Pointer is used by a BPF reuseport array"? Martin, WDYT?
SGTM. Thanks.
OK. It seems that this flag is introduced fromc9a368f1c0fb ("bpf: net: Avoid incorrect bpf_sk_reuseport_detach call"). I will search for more detailed description in this commit.
Quoted 13 lines
Quoted 13 lines
Review
Quoted 10 lines
(quoted diff) +9
-0+/** + * rcu_dereference_sk_user_data_psock - return psock if sk_user_data + * points to the psock type(SK_USER_DATA_PSOCK flag is set), otherwise + * return NULL + * + * @sk: socket + */ +static inline +struct sk_psock *rcu_dereference_sk_user_data_psock(const struct sock *sk)nit: the return type more commonly goes on the same line as "static inline"
Ok. I will correct it.
Quoted 13 lines
Quoted 13 lines
Review
Quoted 9 lines
(quoted diff) +8
-0+{ + uintptr_t __tmp = (uintptr_t)rcu_dereference(__sk_user_data((sk))); + + if (__tmp & SK_USER_DATA_PSOCK) + return (struct sk_psock *)(__tmp & SK_USER_DATA_PTRMASK); + + return NULL; +}As a follow up we can probably generalize this into
__rcu_dereference_sk_user_data_cond(sk, bit)
Quoted 7 lines
Quoted 7 lines
and make the psock just call that:
static inline struct
sk_psock*rcu_dereference_sk_user_data_psock(const struct sock *sk)
{
return__rcu_dereference_sk_user_data_cond(sk, SK_USER_DATA_PSOCK); }
Yes. I will refactor it in this way.
Quoted 25 lines
Quoted 25 lines
kernel/bpf/reuseport_array.c +3
-6@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map) /* The caller must hold the reuseport_lock */ void bpf_sk_reuseport_detach(struct sock *sk) { - uintptr_t sk_user_data; + struct sock __rcu **socks; write_lock_bh(&sk->sk_callback_lock); - sk_user_data = (uintptr_t)sk->sk_user_data; - if (sk_user_data & SK_USER_DATA_BPF) { - struct sock __rcu **socks; - - socks = (void *)(sk_user_data & SK_USER_DATA_PTRMASK); + socks = __rcu_dereference_sk_user_data_cond(sk, SK_USER_DATA_BPF); + if (socks) { WRITE_ONCE(sk->sk_user_data, NULL); /** Do not move this NULL assignment outside of
Quoted 1 line
Quoted 1 line
But that must be a separate patch, not part of this fix.
I wonder if it is proper to gather these together in a patchset, for they are all about flags in sk_user_data, maybe:
[PATCH v5 0/2] net: enhancement to flags in sk_user_data field
- introduce the patchset
[PATCH v5 1/2] net: clean up code for flags in sk_user_data field
- refactor the things in include/linux/skmsg.h andinclude/net/sock.h
- refactor the flags's usage by other code, such asnet/core/skmsg.c and kernel/bpf/reuseport_array.c
[PATCH v5 2/2] net: fix refcount bug in sk_psock_get (2)
- add SK_USER_DATA_PSOCK flag in sk_user_data field
_______________________________________________
Linux-kernel-mentees mailing list [email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Jakub Kicinski
maintainerRe: [PATCH v4] net: fix refcount bug in sk_psock_get (2)
Quoted 6 lines · On Thu, 4 Aug 2022 11:05:15 +0800 Hawkins Jiawei wrote:
I wonder if it is proper to gather these together in a patchset, for they are all about flags in
sk_user_data, maybe:[PATCH v5 0/2] net: enhancement to flags in
sk_user_datafield
- introduce the patchset
Quoted 8 lines
[PATCH v5 1/2] net: clean up code for flags in
sk_user_datafield
- refactor the things ininclude/linux/skmsg.handinclude/net/sock.h
- refactor the flags's usage by other code, such asnet/core/skmsg.candkernel/bpf/reuseport_array.c[PATCH v5 2/2] net: fix refcount bug in
sk_psock_get(2)
- addSK_USER_DATA_PSOCKflag insk_user_datafield
Usually the fix comes first, because it needs to be backported to stable, and we don't want to have to pull extra commits into stable and risk regressions in code which was not directly involved in the bug.
Re: [PATCH v4] net: fix refcount bug in sk_psock_get (2)
Quoted 14 lines · Jakub Kicinski
Quoted 12 lines · On Thu, 4 Aug 2022 11:05:15 +0800 Hawkins Jiawei wrote:
I wonder if it is proper to gather these together in a patchset, for they are all about flags in
sk_user_data, maybe:[PATCH v5 0/2] net: enhancement to flags in
sk_user_datafield
- introduce the patchset[PATCH v5 1/2] net: clean up code for flags in
sk_user_datafield
- refactor the things ininclude/linux/skmsg.handinclude/net/sock.h
- refactor the flags's usage by other code, such asnet/core/skmsg.candkernel/bpf/reuseport_array.c
Quoted 6 lines
Quoted 2 lines
[PATCH v5 2/2] net: fix refcount bug in
sk_psock_get(2)
- addSK_USER_DATA_PSOCKflag insk_user_datafieldUsually the fix comes first, because it needs to be backported to stable, and we don't want to have to pull extra commits into stable and risk regressions in code which was not directly involved in the bug.
Ok, I got it. Thanks for the explanation.
v5 cover net: enhancements to sk_user_data field
In reply to syzbotThis patchset fixes refcount bug by adding SK_USER_DATA_PSOCK flag bit in sk_user_data field. The bug cause following info:
WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
To improve code maintainability, this patchset refactors sk_user_data flags code to be more generic.
Hawkins Jiawei (2):
net: fix refcount bug in sk_psock_get (2)
net: refactor bpf_sk_reuseport_detach()
include/linux/skmsg.h | 3 +- include/net/sock.h | 68 +++++++++++++++++++++++++----------- kernel/bpf/reuseport_array.c | 9 ++--- net/core/skmsg.c | 4 ++- 4 files changed, 56 insertions(+), 28 deletions(-)
Signature · 1 line
2.25.1
PATCH v5 1/2 net: fix refcount bug in sk_psock_get (2)
Syzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets clcsk->sk_user_data to origin smc socket in smc_fback_replace_callbacks().
Later, in shutdown syscall, kernel will calls sk_psock_get(), which treats the clcsk->sk_user_data as psock type, triggering the refcnt warning.
So, the root cause is that smc and psock, both will use sk_user_data field. So they will mismatch this field easily.
This patch solves it by using another bit(defined as SK_USER_DATA_PSOCK) in PTRMASK, to mark whether sk_user_data points to a psock object or not.
This patch depends on a PTRMASK introduced in commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").
For there will possibly be more flags in the sk_user_data field, this patch also refactor sk_user_data flags code to be more generic to improve its maintainability.
---
v4 -> v5:
- add more info about SK_USER_DATA_BPF in comment
- correct the function definition format
- generalize rcu_deference_sk_user_data_psock() into__rcu_deference_sk_user_data_with_flags()
v3 -> v4:
- change new subject
- fix diff content, which has been edit accidentally
v2 -> v3:
- use SK_USER_DATA_PSOCK instead of SK_USER_DATA_NOTPSOCK
to patch the bug
- refactor the code on assigning to sk_user_data field
in psock part
- refactor the code on getting and setting the flag
with sk_user_data field
v1 -> v2:
- add bit in PTRMASK to patch the bug
include/linux/skmsg.h | 3 +- include/net/sock.h | 68 ++++++++++++++++++++++++++++++------------- net/core/skmsg.c | 4 ++- 3 files changed, 53 insertions(+), 22 deletions(-)
include/linux/skmsg.h +2 -1
@@ -277,7 +277,8 @@ static inline void sk_msg_sg_copy_clear(struct sk_msg *msg, u32 start)static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return __rcu_dereference_sk_user_data_with_flags (sk, +SK_USER_DATA_PSOCK ); } static inline void sk_psock_set_state(struct sk_psock *psock,
include/net/sock.h +48 -20
86 lines not on this page · raw message
net/core/skmsg.c +3 -1
@@ -735,7 +735,9 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)sk_psock_set_state (psock,SK_PSOCK_TX_ENABLED );refcount_set (&psock->refcnt,1 ); -rcu_assign_sk_user_data_nocopy (sk, psock); +__rcu_assign_sk_user_data_with_flags (sk, psock, +SK_USER_DATA_NOCOPY | +SK_USER_DATA_PSOCK );sock_hold (sk); out:
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v5 2/2 net: refactor bpf_sk_reuseport_detach()
In reply to Hawkins JiaweiRefactor sk_user_data dereference using more generic function __rcu_dereference_sk_user_data_with_flags(), which improve its maintainability
--- kernel/bpf/reuseport_array.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
kernel/bpf/reuseport_array.c +3 -6
@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map)/* The caller must hold the reuseport_lock */ void bpf_sk_reuseport_detach (struct sock *sk) { -uintptr_t sk_user_data; +struct sock __rcu **socks;write_lock_bh (&sk->sk_callback_lock); - sk_user_data = (uintptr_t )sk->sk_user_data; -if (sk_user_data &SK_USER_DATA_BPF ) { -struct sock __rcu **socks; - - socks = (void *)(sk_user_data &SK_USER_DATA_PTRMASK ); + socks =__rcu_dereference_sk_user_data_with_flags (sk,SK_USER_DATA_BPF ); +if (socks) {WRITE_ONCE (sk->sk_user_data,NULL );/* * Do not move this NULL assignment outside of
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH net v5 0/2] net: enhancements to sk_user_data field
In reply to Hawkins JiaweiQuoted 38 lines · Hawkins Jiawei
This patchset fixes refcount bug by adding
SK_USER_DATA_PSOCKflag bit insk_user_datafield. The bug cause following info:WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>To improve code maintainability, this patchset refactors
sk_user_dataflags code to be more generic.Hawkins Jiawei (2):
net: fix refcount bug insk_psock_get(2)
net: refactorbpf_sk_reuseport_detach()
Quoted 5 lines
include/linux/skmsg.h | 3 +- include/net/sock.h | 68 +++++++++++++++++++++++++----------- kernel/bpf/reuseport_array.c | 9 ++--- net/core/skmsg.c | 4 ++- 4 files changed, 56 insertions(+), 28 deletions(-)
Thank you for the fix.
For the series:
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH net v5 0/2] net: enhancements to sk_user_data field
Quoted 6 lines · Jakub Sitnicki
Thank you for the fix.
For the series:
Reviewed-by Jakub Sitnicki <[email protected]>
Thanks for your patience, it really helps me a lot!
_______________________________________________
Linux-kernel-mentees mailing list [email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH net v5 0/2] net: enhancements to sk_user_data field
In reply to Hawkins JiaweiThis series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 31 lines · On Fri, 5 Aug 2022 15:36:48 +0800 you wrote:
This patchset fixes refcount bug by adding
SK_USER_DATA_PSOCKflag bit insk_user_datafield. The bug cause following info:WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
Quoted 1 line
[...]
Here is the summary with links:
- [net,v5,1/2] net: fix refcount bug in sk_psock_get (2)
https://git.kernel.org/netdev/net/c/2a0133723f9e - [net,v5,2/2] net: refactor bpf_sk_reuseport_detach() https://git.kernel.org/netdev/net/c/cf8c1e967224
You are awesome, thank you!
Signature · 8 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH net v5 2/2] net: refactor bpf_sk_reuseport_detach()
In reply to Hawkins JiaweiQuoted 18 lines · Hawkins Jiawei
Refactor
sk_user_datadereference using more generic function__rcu_dereference_sk_user_data_with_flags(), which improve its maintainabilitySuggested-by Jakub Kicinski <[email protected]>Signed-off-by Hawkins Jiawei <[email protected]>--- kernel/bpf/reuseport_array.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)kernel/bpf/reuseport_array.c +0
-0@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map)/* The caller must hold the reuseport_lock */ void bpf_sk_reuseport_detach (struct sock *sk) {
kernel/bpf/reuseport_array.c static struct reuseport_array *reuseport_array(struct bpf_map *map) · line 27
Quoted 10 lines
kernel/bpf/reuseport_array.c +2
-6-uintptr_t sk_user_data; +struct sock __rcu **socks;write_lock_bh (&sk->sk_callback_lock); - sk_user_data = (uintptr_t )sk->sk_user_data; -if (sk_user_data &SK_USER_DATA_BPF ) { -struct sock __rcu **socks; - - socks = (void *)(sk_user_data &SK_USER_DATA_PTRMASK ); + socks =__rcu_dereference_sk_user_data_with_flags (sk,SK_USER_DATA_BPF );
syzbot reports 'suspicious rcu_dereference_check() usage':
https://lore.kernel.org/netdev/[email protected]/
rcu_read_lock() does not need to be held here.
One option is to use rcu_access_pointer.
Another option is to use rcu_dereference_check() and pass the lockdep_is_held(&sk->sk_callback_lock) from here.
Quoted 7 lines
kernel/bpf/reuseport_array.c +1
-0+if (socks) {WRITE_ONCE (sk->sk_user_data,NULL );/* * Do not move this NULL assignment outside of Signature · 1 line
2.25.1
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees