diff options
| author | Willem de Bruijn <willemb@google.com> | 2017-09-26 12:19:37 -0400 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2018-05-30 11:41:50 -0700 |
| commit | d24fa2f91d21e8b80205898d583ab84fc0a6cc1d (patch) | |
| tree | 71e3425026f655038b6f37abbe0ba382fa64da0a | |
| parent | 5d534f5b34a5f1f7575523a5da39c5f48f7cc3c5 (diff) | |
| download | tegra-d24fa2f91d21e8b80205898d583ab84fc0a6cc1d.tar.gz | |
packet: in packet_do_bind, test fanout with bind_lock held
[ Upstream commit 4971613c1639d8e5f102c4e797c3bf8f83a5a69e ]
Once a socket has po->fanout set, it remains a member of the group
until it is destroyed. The prot_hook must be constant and identical
across sockets in the group.
If fanout_add races with packet_do_bind between the test of po->fanout
and taking the lock, the bind call may make type or dev inconsistent
with that of the fanout group.
Hold po->bind_lock when testing po->fanout to avoid this race.
I had to introduce artificial delay (local_bh_enable) to actually
observe the race.
Fixes: dc99f600698d ("packet: Add fanout support.")
Bug: 79377438
Signed-off-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Id7d8fa55b0bbb6d49c10bf669538294531299974
| -rw-r--r-- | net/packet/af_packet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b502f1933aea..72c9abbed611 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2673,13 +2673,15 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex, int ret = 0; bool unlisted = false; - if (po->fanout) - return -EINVAL; - lock_sock(sk); spin_lock(&po->bind_lock); rcu_read_lock(); + if (po->fanout) { + ret = -EINVAL; + goto out_unlock; + } + if (name) { dev = dev_get_by_name_rcu(sock_net(sk), name); if (!dev) { |