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/unix/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/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index 79b182d0e62a..ca3473026151 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -106,7 +106,7 @@ static int sk_diag_show_rqlen(struct sock *sk, struct sk_buff *nlskb) static int sk_diag_dump_uid(struct sock *sk, struct sk_buff *nlskb, struct user_namespace *user_ns) { - uid_t uid = from_kuid_munged(user_ns, sock_i_uid(sk)); + uid_t uid = from_kuid_munged(user_ns, sk_uid(sk)); return nla_put(nlskb, UNIX_DIAG_UID, sizeof(uid_t), &uid); } |