diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-09 19:02:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-09 19:02:41 +0200 |
| commit | 55d40c0636e51ed07f2eccaaf70d1d7d72ea5984 (patch) | |
| tree | c2187083f2f14bb87a90a39d210e25b24412fa31 /net/tipc/socket.c | |
| parent | 2bd84652053c03a503a2ae99685d9535b651d021 (diff) | |
| parent | 1037d3a33ba609fac558643fbb794b24a562af35 (diff) | |
Merge v6.16.6
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7c61d47ea208..e028bf658499 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -3642,7 +3642,7 @@ int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct netlink_callback *cb, nla_put_u32(skb, TIPC_NLA_SOCK_INO, sock_i_ino(sk)) || nla_put_u32(skb, TIPC_NLA_SOCK_UID, from_kuid_munged(sk_user_ns(NETLINK_CB(cb->skb).sk), - sock_i_uid(sk))) || + sk_uid(sk))) || nla_put_u64_64bit(skb, TIPC_NLA_SOCK_COOKIE, tipc_diag_gen_cookie(sk), TIPC_NLA_SOCK_PAD)) |