diff options
| author | Eric Dumazet <[email protected]> | 2025-06-20 13:30:01 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-06-24 00:04:03 +0000 |
| commit | c51da3f7a161c6822232be832abdffe47eb55b4c (patch) | |
| tree | c4b86a281dc187fc8b74f9723043e2bfa87bd7d8 /net/ipv4/inet_diag.c | |
| parent | net: annotate races around sk->sk_uid (diff) | |
| download | kernel-c51da3f7a161c6822232be832abdffe47eb55b4c.tar.gz kernel-c51da3f7a161c6822232be832abdffe47eb55b4c.zip | |
net: remove sock_i_uid()
Difference between sock_i_uid() and sk_uid() is that
after sock_orphan(), sock_i_uid() returns GLOBAL_ROOT_UID
while sk_uid() returns the last cached sk->sk_uid value.
None of sock_i_uid() callers care about this.
Use sk_uid() which is much faster and inlined.
Note that diag/dump users are calling sock_i_ino() and
can not see the full benefit yet.
Signed-off-by: Eric Dumazet <[email protected]>
Cc: Lorenzo Colitti <[email protected]>
Reviewed-by: Maciej Żenczykowski <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/inet_diag.c')
| -rw-r--r-- | net/ipv4/inet_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 1d1d6ad53f4c..2fa53b16fe77 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -181,7 +181,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, goto errout; #endif - r->idiag_uid = from_kuid_munged(user_ns, sock_i_uid(sk)); + r->idiag_uid = from_kuid_munged(user_ns, sk_uid(sk)); r->idiag_inode = sock_i_ino(sk); memset(&inet_sockopt, 0, sizeof(inet_sockopt)); |