[PATCH net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()

[PATCH net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()

[Eric Dumazet]

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: Daniel Zahka <daniel.zahka@gmail.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Willem de Bruijn <willemb@google.com>
---
 net/psp/psp_sock.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/net/psp/psp_sock.c b/net/psp/psp_sock.c
index afa966c6b69dc657a54425656131b57645c81f6f..d19e37e939672c1f8fc0ebb62e50a3fb32cc8d25 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;
 }
 
-- 
2.51.0.384.g4c02a37b29-goog

Re: [PATCH net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()

[Daniel Zahka]

On 9/18/25 7:52 AM, Eric Dumazet wrote:
> 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>
>

Tested-by: Daniel Zahka <daniel.zahka@gmail.com>
Reviewed-by: Daniel Zahka <daniel.zahka@gmail.com>

Re: [PATCH net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()

[Kuniyuki Iwashima]

On Thu, Sep 18, 2025 at 4:52 AM Eric Dumazet <edumazet@google.com> wrote:
>
> 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>

Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>

Re: [PATCH net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 18 Sep 2025 11:52:38 +0000 you wrote:
> 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: Daniel Zahka <daniel.zahka@gmail.com>
> Cc: Kuniyuki Iwashima <kuniyu@google.com>
> Cc: Willem de Bruijn <willemb@google.com>
> 
> [...]

Here is the summary with links:
  - [net-next] psp: do not use sk_dst_get() in psp_dev_get_for_sock()
    https://git.kernel.org/netdev/net-next/c/17f1b7711e81

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html