summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2025-09-18 11:52:38 +0000
committerJakub Kicinski <kuba@kernel.org>2025-09-19 07:05:26 -0700
commit17f1b7711e81107de60ff1f74b93fe5111dd3b0a (patch)
tree9c41941f8f9aa53775e4ba0a502fafd899ce78d8
parent315f423be0d1ebe720d8fd4fa6bed68586b13d34 (diff)
psp: do not use sk_dst_get() in psp_dev_get_for_sock()
Use __sk_dst_get() and dst_dev_rcu(), because dst->dev could be changed under us. Fixes: 6b46ca260e22 ("net: psp: add socket security association code") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Willem de Bruijn <willemb@google.com> Tested-by: Daniel Zahka <daniel.zahka@gmail.com> Reviewed-by: Daniel Zahka <daniel.zahka@gmail.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Link: https://patch.msgid.link/20250918115238.237475-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/psp/psp_sock.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/net/psp/psp_sock.c b/net/psp/psp_sock.c
index afa966c6b69d..d19e37e93967 100644
--- a/net/psp/psp_sock.c
+++ b/net/psp/psp_sock.c
@@ -11,21 +11,18 @@
struct psp_dev *psp_dev_get_for_sock(struct sock *sk)
{
+ struct psp_dev *psd = NULL;
struct dst_entry *dst;
- struct psp_dev *psd;
-
- dst = sk_dst_get(sk);
- if (!dst)
- return NULL;
rcu_read_lock();
- psd = rcu_dereference(dst->dev->psp_dev);
- if (psd && !psp_dev_tryget(psd))
- psd = NULL;
+ dst = __sk_dst_get(sk);
+ if (dst) {
+ psd = rcu_dereference(dst_dev_rcu(dst)->psp_dev);
+ if (psd && !psp_dev_tryget(psd))
+ psd = NULL;
+ }
rcu_read_unlock();
- dst_release(dst);
-
return psd;
}