Skip to content

Commit

Permalink
af_packet: do not use READ_ONCE() in packet_bind()
Browse files Browse the repository at this point in the history
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: 822b5a1 ("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>
  • Loading branch information
Eric Dumazet authored and kuba-moo committed May 30, 2023
1 parent 0684f29 commit 6ffc57e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -3201,6 +3201,9 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex,

lock_sock(sk);
spin_lock(&po->bind_lock);
if (!proto)
proto = po->num;

rcu_read_lock();

if (po->fanout) {
Expand Down Expand Up @@ -3299,7 +3302,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
memcpy(name, uaddr->sa_data, sizeof(uaddr->sa_data_min));
name[sizeof(uaddr->sa_data_min)] = 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)
Expand All @@ -3316,8 +3319,7 @@ static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
if (sll->sll_family != AF_PACKET)
return -EINVAL;

return packet_do_bind(sk, NULL, sll->sll_ifindex,
sll->sll_protocol ? : READ_ONCE(pkt_sk(sk)->num));
return packet_do_bind(sk, NULL, sll->sll_ifindex, sll->sll_protocol);
}

static struct proto packet_proto = {
Expand Down

0 comments on commit 6ffc57e

Please sign in to comment.