github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'address-miscellaneous-issues-with-psp_sk_get_assoc_rcu'

Browse Source 
Daniel Zahka says:

====================
address miscellaneous issues with psp_sk_get_assoc_rcu()

There were a few minor issues with psp_sk_get_assoc_rcu() identified
by Eric in his review of the initial psp series. This series addresses
them.
====================

Link: https://patch.msgid.link/20250918155205.2197603-1-daniel.zahka@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-09-19 17:01:22 -07:00
commit d373176425
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/net/psp/functions.h
View File

@ -124,19 +124,18 @@ psp_twsk_rx_policy_check(struct inet_timewait_sock *tw, struct sk_buff *skb)
return __psp_sk_rx_policy_check(skb, rcu_dereference(tw->psp_assoc));
}
static inline struct psp_assoc *psp_sk_get_assoc_rcu(struct sock *sk)
static inline struct psp_assoc *psp_sk_get_assoc_rcu(const struct sock *sk)
{
struct inet_timewait_sock *tw;
struct psp_assoc *pas;
int state;
state = 1 << READ_ONCE(sk->sk_state);
if (!sk_is_inet(sk) || state & TCPF_NEW_SYN_RECV)
state = READ_ONCE(sk->sk_state);
if (!sk_is_inet(sk) || state == TCP_NEW_SYN_RECV)
return NULL;
tw = inet_twsk(sk);
pas = state & TCPF_TIME_WAIT ? rcu_dereference(tw->psp_assoc) :
rcu_dereference(sk->psp_assoc);
pas = state == TCP_TIME_WAIT ?
rcu_dereference(inet_twsk(sk)->psp_assoc) :
rcu_dereference(sk->psp_assoc);
return pas;
}