Skip to content

Commit a1865f2

Browse files
edumazetkuba-moo
authored andcommitted
netlink: annotate lockless accesses to nlk->max_recvmsg_len
syzbot reported a data-race in data-race in netlink_recvmsg() [1] Indeed, netlink_recvmsg() can be run concurrently, and netlink_dump() also needs protection. [1] BUG: KCSAN: data-race in netlink_recvmsg / netlink_recvmsg read to 0xffff888141840b38 of 8 bytes by task 23057 on cpu 0: netlink_recvmsg+0xea/0x730 net/netlink/af_netlink.c:1988 sock_recvmsg_nosec net/socket.c:1017 [inline] sock_recvmsg net/socket.c:1038 [inline] __sys_recvfrom+0x1ee/0x2e0 net/socket.c:2194 __do_sys_recvfrom net/socket.c:2212 [inline] __se_sys_recvfrom net/socket.c:2208 [inline] __x64_sys_recvfrom+0x78/0x90 net/socket.c:2208 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd write to 0xffff888141840b38 of 8 bytes by task 23037 on cpu 1: netlink_recvmsg+0x114/0x730 net/netlink/af_netlink.c:1989 sock_recvmsg_nosec net/socket.c:1017 [inline] sock_recvmsg net/socket.c:1038 [inline] ____sys_recvmsg+0x156/0x310 net/socket.c:2720 ___sys_recvmsg net/socket.c:2762 [inline] do_recvmmsg+0x2e5/0x710 net/socket.c:2856 __sys_recvmmsg net/socket.c:2935 [inline] __do_sys_recvmmsg net/socket.c:2958 [inline] __se_sys_recvmmsg net/socket.c:2951 [inline] __x64_sys_recvmmsg+0xe2/0x160 net/socket.c:2951 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd value changed: 0x0000000000000000 -> 0x0000000000001000 Reported by Kernel Concurrency Sanitizer on: CPU: 1 PID: 23037 Comm: syz-executor.2 Not tainted 6.3.0-rc4-syzkaller-00195-g5a57b48fdfcb #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023 Fixes: 9063e21 ("netlink: autosize skb lengthes") Reported-by: syzbot <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e847c76 commit a1865f2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

net/netlink/af_netlink.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
19521952
struct scm_cookie scm;
19531953
struct sock *sk = sock->sk;
19541954
struct netlink_sock *nlk = nlk_sk(sk);
1955-
size_t copied;
1955+
size_t copied, max_recvmsg_len;
19561956
struct sk_buff *skb, *data_skb;
19571957
int err, ret;
19581958

@@ -1985,9 +1985,10 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
19851985
#endif
19861986

19871987
/* Record the max length of recvmsg() calls for future allocations */
1988-
nlk->max_recvmsg_len = max(nlk->max_recvmsg_len, len);
1989-
nlk->max_recvmsg_len = min_t(size_t, nlk->max_recvmsg_len,
1990-
SKB_WITH_OVERHEAD(32768));
1988+
max_recvmsg_len = max(READ_ONCE(nlk->max_recvmsg_len), len);
1989+
max_recvmsg_len = min_t(size_t, max_recvmsg_len,
1990+
SKB_WITH_OVERHEAD(32768));
1991+
WRITE_ONCE(nlk->max_recvmsg_len, max_recvmsg_len);
19911992

19921993
copied = data_skb->len;
19931994
if (len < copied) {
@@ -2236,6 +2237,7 @@ static int netlink_dump(struct sock *sk)
22362237
struct netlink_ext_ack extack = {};
22372238
struct netlink_callback *cb;
22382239
struct sk_buff *skb = NULL;
2240+
size_t max_recvmsg_len;
22392241
struct module *module;
22402242
int err = -ENOBUFS;
22412243
int alloc_min_size;
@@ -2258,8 +2260,9 @@ static int netlink_dump(struct sock *sk)
22582260
cb = &nlk->cb;
22592261
alloc_min_size = max_t(int, cb->min_dump_alloc, NLMSG_GOODSIZE);
22602262

2261-
if (alloc_min_size < nlk->max_recvmsg_len) {
2262-
alloc_size = nlk->max_recvmsg_len;
2263+
max_recvmsg_len = READ_ONCE(nlk->max_recvmsg_len);
2264+
if (alloc_min_size < max_recvmsg_len) {
2265+
alloc_size = max_recvmsg_len;
22632266
skb = alloc_skb(alloc_size,
22642267
(GFP_KERNEL & ~__GFP_DIRECT_RECLAIM) |
22652268
__GFP_NOWARN | __GFP_NORETRY);

0 commit comments

Comments
 (0)