Skip to content

Commit e032f7c

Browse files
edumazetdavem330
authored andcommitted
net/packet: annotate accesses to po->ifindex
Like prior patch, we need to annotate lockless accesses to po->ifindex For instance, packet_getname() is reading po->ifindex (twice) while another thread is able to change po->ifindex. KCSAN reported: BUG: KCSAN: data-race in packet_do_bind / packet_getname write to 0xffff888143ce3cbc of 4 bytes by task 25573 on cpu 1: packet_do_bind+0x420/0x7e0 net/packet/af_packet.c:3191 packet_bind+0xc3/0xd0 net/packet/af_packet.c:3255 __sys_bind+0x200/0x290 net/socket.c:1637 __do_sys_bind net/socket.c:1648 [inline] __se_sys_bind net/socket.c:1646 [inline] __x64_sys_bind+0x3d/0x50 net/socket.c:1646 do_syscall_64+0x4a/0x90 arch/x86/entry/common.c:47 entry_SYSCALL_64_after_hwframe+0x44/0xae read to 0xffff888143ce3cbc of 4 bytes by task 25578 on cpu 0: packet_getname+0x5b/0x1a0 net/packet/af_packet.c:3525 __sys_getsockname+0x10e/0x1a0 net/socket.c:1887 __do_sys_getsockname net/socket.c:1902 [inline] __se_sys_getsockname net/socket.c:1899 [inline] __x64_sys_getsockname+0x3e/0x50 net/socket.c:1899 do_syscall_64+0x4a/0x90 arch/x86/entry/common.c:47 entry_SYSCALL_64_after_hwframe+0x44/0xae value changed: 0x00000000 -> 0x00000001 Reported by Kernel Concurrency Sanitizer on: CPU: 0 PID: 25578 Comm: syz-executor.5 Not tainted 5.13.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Signed-off-by: Eric Dumazet <[email protected]> Reported-by: syzbot <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c7d2ef5 commit e032f7c

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

net/packet/af_packet.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,11 +3187,11 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,
31873187
if (unlikely(unlisted)) {
31883188
dev_put(dev);
31893189
po->prot_hook.dev = NULL;
3190-
po->ifindex = -1;
3190+
WRITE_ONCE(po->ifindex, -1);
31913191
packet_cached_dev_reset(po);
31923192
} else {
31933193
po->prot_hook.dev = dev;
3194-
po->ifindex = dev ? dev->ifindex : 0;
3194+
WRITE_ONCE(po->ifindex, dev ? dev->ifindex : 0);
31953195
packet_cached_dev_assign(po, dev);
31963196
}
31973197
}
@@ -3505,7 +3505,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr,
35053505
uaddr->sa_family = AF_PACKET;
35063506
memset(uaddr->sa_data, 0, sizeof(uaddr->sa_data));
35073507
rcu_read_lock();
3508-
dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex);
3508+
dev = dev_get_by_index_rcu(sock_net(sk), READ_ONCE(pkt_sk(sk)->ifindex));
35093509
if (dev)
35103510
strlcpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data));
35113511
rcu_read_unlock();
@@ -3520,16 +3520,18 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
35203520
struct sock *sk = sock->sk;
35213521
struct packet_sock *po = pkt_sk(sk);
35223522
DECLARE_SOCKADDR(struct sockaddr_ll *, sll, uaddr);
3523+
int ifindex;
35233524

35243525
if (peer)
35253526
return -EOPNOTSUPP;
35263527

3528+
ifindex = READ_ONCE(po->ifindex);
35273529
sll->sll_family = AF_PACKET;
3528-
sll->sll_ifindex = po->ifindex;
3530+
sll->sll_ifindex = ifindex;
35293531
sll->sll_protocol = READ_ONCE(po->num);
35303532
sll->sll_pkttype = 0;
35313533
rcu_read_lock();
3532-
dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex);
3534+
dev = dev_get_by_index_rcu(sock_net(sk), ifindex);
35333535
if (dev) {
35343536
sll->sll_hatype = dev->type;
35353537
sll->sll_halen = dev->addr_len;
@@ -4108,7 +4110,7 @@ static int packet_notifier(struct notifier_block *this,
41084110
}
41094111
if (msg == NETDEV_UNREGISTER) {
41104112
packet_cached_dev_reset(po);
4111-
po->ifindex = -1;
4113+
WRITE_ONCE(po->ifindex, -1);
41124114
if (po->prot_hook.dev)
41134115
dev_put(po->prot_hook.dev);
41144116
po->prot_hook.dev = NULL;
@@ -4620,7 +4622,7 @@ static int packet_seq_show(struct seq_file *seq, void *v)
46204622
refcount_read(&s->sk_refcnt),
46214623
s->sk_type,
46224624
ntohs(READ_ONCE(po->num)),
4623-
po->ifindex,
4625+
READ_ONCE(po->ifindex),
46244626
po->running,
46254627
atomic_read(&s->sk_rmem_alloc),
46264628
from_kuid_munged(seq_user_ns(seq), sock_i_uid(s)),

0 commit comments

Comments
 (0)