NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

af_packet: do not use READ_ONCE() in packet_bind()

Browse source 
[ Upstream commit 6ffc57ea004234d9373c57b204fd10370a69f392 ]

A recent patch added READ_ONCE() in packet_bind() and packet_bind_spkt()

This is better handled by reading pkt_sk(sk)->num later
in packet_do_bind() while appropriate lock is held.

READ_ONCE() in writers are often an evidence of something being wrong.

Fixes: 822b5a1c17df ("af_packet: Fix data-races of pkt_sk(sk)->num.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230526154342.2533026-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2023-05-26 15:43:42 +00:00 • committed by Greg Kroah-Hartman
parent 906134664f
commit 0dec22a09d
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/packet/af_packet.c
View file

@ -3193,6 +3193,9 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,
lock_sock(sk); lock_sock(sk);
spin_lock(&po->bind_lock); spin_lock(&po->bind_lock);
if (!proto)
proto = po->num;
rcu_read_lock(); rcu_read_lock();
if (po->fanout) { if (po->fanout) {
@ -3291,7 +3294,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
memcpy(name, uaddr->sa_data, sizeof(uaddr->sa_data)); memcpy(name, uaddr->sa_data, sizeof(uaddr->sa_data));
name[sizeof(uaddr->sa_data)] = 0; name[sizeof(uaddr->sa_data)] = 0;
return packet_do_bind(sk, name, 0, READ_ONCE(pkt_sk(sk)->num)); return packet_do_bind(sk, name, 0, 0);
} }
static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
@ -3308,8 +3311,7 @@ static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
if (sll->sll_family != AF_PACKET) if (sll->sll_family != AF_PACKET)
return -EINVAL; return -EINVAL;
return packet_do_bind(sk, NULL, sll->sll_ifindex, return packet_do_bind(sk, NULL, sll->sll_ifindex, sll->sll_protocol);
sll->sll_protocol ? : READ_ONCE(pkt_sk(sk)->num));
} }
static struct proto packet_proto = { static struct proto packet_proto = {