Commit 70f87de9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net_sched: em_meta: add READ_ONCE() in var_sk_bound_if()

sk->sk_bound_dev_if can change under us, use READ_ONCE() annotation.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2c13561
...@@ -311,12 +311,15 @@ META_COLLECTOR(int_sk_bound_if) ...@@ -311,12 +311,15 @@ META_COLLECTOR(int_sk_bound_if)
META_COLLECTOR(var_sk_bound_if) META_COLLECTOR(var_sk_bound_if)
{ {
int bound_dev_if;
if (skip_nonlocal(skb)) { if (skip_nonlocal(skb)) {
*err = -1; *err = -1;
return; return;
} }
if (skb->sk->sk_bound_dev_if == 0) { bound_dev_if = READ_ONCE(skb->sk->sk_bound_dev_if);
if (bound_dev_if == 0) {
dst->value = (unsigned long) "any"; dst->value = (unsigned long) "any";
dst->len = 3; dst->len = 3;
} else { } else {
...@@ -324,7 +327,7 @@ META_COLLECTOR(var_sk_bound_if) ...@@ -324,7 +327,7 @@ META_COLLECTOR(var_sk_bound_if)
rcu_read_lock(); rcu_read_lock();
dev = dev_get_by_index_rcu(sock_net(skb->sk), dev = dev_get_by_index_rcu(sock_net(skb->sk),
skb->sk->sk_bound_dev_if); bound_dev_if);
*err = var_dev(dev, dst); *err = var_dev(dev, dst);
rcu_read_unlock(); rcu_read_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment