From 70f87de9fa0d454c5c176876fe5d5f6a7bb1fe9d Mon Sep 17 00:00:00 2001

From: Eric Dumazet <edumazet@google.com>

Date: Fri, 13 May 2022 11:55:47 -0700

Subject: [PATCH] net_sched: em_meta: add READ_ONCE() in var_sk_bound_if()

Git-commit: 70f87de9fa0d454c5c176876fe5d5f6a7bb1fe9d

Patch-mainline: v5.19-rc1

References: bsc#1207361

sk->sk_bound_dev_if can change under us, use READ_ONCE() annotation.

Signed-off-by: Eric Dumazet <edumazet@google.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Jiri Wiesner <jwiesner@suse.de>

---

 net/sched/em_meta.c | 7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c

index 0a04468b7314..49bae3d5006b 100644

--- a/net/sched/em_meta.c

+++ b/net/sched/em_meta.c

@@ -311,12 +311,15 @@ META_COLLECTOR(int_sk_bound_if)

 META_COLLECTOR(var_sk_bound_if)

 {

+	int bound_dev_if;

+

 	if (skip_nonlocal(skb)) {

 		*err = -1;

 		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->len = 3;

 	} else {

@@ -324,7 +327,7 @@ META_COLLECTOR(var_sk_bound_if)

 		rcu_read_lock();

 		dev = dev_get_by_index_rcu(sock_net(skb->sk),

-					   skb->sk->sk_bound_dev_if);

+					   bound_dev_if);

 		*err = var_dev(dev, dst);

 		rcu_read_unlock();

 	}

-- 

2.35.3