net: replace sock_i_uid() with sk_uid()
Subsystems (17)
cover net: replace sock_i_uid() with sk_uid()
First patch annotates sk->sk_uid accesses and adds sk_uid() helper.
Second patch removes sock_i_uid() in favor of the new helper.
Eric Dumazet (2):
net: annotate races around sk->sk_uid
net: remove sock_i_uid()
include/net/route.h | 4 ++-- include/net/sock.h | 12 +++++++++--- net/appletalk/atalk_proc.c | 2 +- net/bluetooth/af_bluetooth.c | 2 +- net/core/sock.c | 11 ----------- net/ipv4/inet_connection_sock.c | 31 ++++++++++++++----------------- net/ipv4/inet_diag.c | 2 +- net/ipv4/inet_hashtables.c | 4 ++-- net/ipv4/ping.c | 4 ++-- net/ipv4/raw.c | 4 ++-- net/ipv4/route.c | 3 ++- net/ipv4/syncookies.c | 3 ++- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv4/udp.c | 19 ++++++++++--------- net/ipv6/af_inet6.c | 2 +- net/ipv6/datagram.c | 4 ++-- net/ipv6/inet6_connection_sock.c | 4 ++-- net/ipv6/ping.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 4 ++-- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 6 +++--- net/ipv6/udp.c | 5 +++-- net/key/af_key.c | 2 +- net/l2tp/l2tp_ip6.c | 2 +- net/llc/llc_proc.c | 2 +- net/mptcp/protocol.c | 2 +- net/packet/af_packet.c | 2 +- net/packet/diag.c | 2 +- net/phonet/socket.c | 4 ++-- net/sctp/input.c | 2 +- net/sctp/proc.c | 4 ++-- net/sctp/socket.c | 4 ++-- net/smc/smc_diag.c | 2 +- net/socket.c | 8 +++++--- net/tipc/socket.c | 2 +- net/unix/af_unix.c | 2 +- net/unix/diag.c | 2 +- net/xdp/xsk_diag.c | 2 +- 39 files changed, 91 insertions(+), 93 deletions(-)
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
PATCH 1/2 net: annotate races around sk->sk_uid
sk->sk_uid can be read while another thread changes its value in sockfs_setattr().
Add sk_uid(const struct sock *sk) helper to factorize the needed READ_ONCE() annotations, and add corresponding WRITE_ONCE() where needed.
--- include/net/route.h | 4 ++-- include/net/sock.h | 12 ++++++++++-- net/ipv4/inet_connection_sock.c | 4 ++-- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 3 ++- net/ipv4/syncookies.c | 3 ++- net/ipv4/udp.c | 3 ++- net/ipv6/af_inet6.c | 2 +- net/ipv6/datagram.c | 2 +- net/ipv6/inet6_connection_sock.c | 4 ++-- net/ipv6/ping.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 4 ++-- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 5 +++-- net/l2tp/l2tp_ip6.c | 2 +- net/mptcp/protocol.c | 2 +- net/socket.c | 8 +++++--- 20 files changed, 42 insertions(+), 28 deletions(-)
include/net/route.h +2 -2
@@ -153,7 +153,7 @@ static inline void inet_sk_init_flowi4(const struct inet_sock *inet,ip_sock_rt_tos (sk),ip_sock_rt_scope (sk), sk->sk_protocol,inet_sk_flowi_flags (sk), daddr, inet->inet_saddr, inet->inet_dport, - inet->inet_sport, sk->sk_uid); + inet->inet_sport, sk_uid(sk));security_sk_classify_flow (sk,flowi4_to_flowi_common (fl4)); }
@@ -331,7 +331,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst,flowi4_init_output (fl4, oif,READ_ONCE (sk->sk_mark),ip_sock_rt_tos (sk),ip_sock_rt_scope (sk), protocol, flow_flags, dst, - src, dport, sport, sk->sk_uid); + src, dport, sport,sk_uid (sk)); } static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst,
include/net/sock.h +10 -2
@@ -2076,6 +2076,7 @@ static inline void sock_orphan(struct sock *sk)sock_set_flag (sk,SOCK_DEAD );sk_set_socket (sk,NULL ); sk->sk_wq =NULL ; +/* Note: sk_uid is unchanged. */ write_unlock_bh (&sk->sk_callback_lock); }
@@ -2086,18 +2087,25 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)rcu_assign_pointer (sk->sk_wq, &parent->wq); parent->sk = sk;sk_set_socket (sk, parent); - sk->sk_uid =SOCK_INODE (parent)->i_uid; +WRITE_ONCE (sk->sk_uid,SOCK_INODE (parent)->i_uid);security_sock_graft (sk, parent);write_unlock_bh (&sk->sk_callback_lock); }kuid_t sock_i_uid (struct sock *sk); + +static inline kuid_t sk_uid (const struct sock *sk) +{ +/* Paired with WRITE_ONCE() in sockfs_setattr() */ +return READ_ONCE (sk->sk_uid); +} +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk) { -return sk ? sk->sk_uid :make_kuid (net->user_ns,0 ); +return sk ?sk_uid (sk) :make_kuid (net->user_ns,0 ); }static inline u32 net_tx_rndhash (void )
net/ipv4/inet_connection_sock.c +2 -2
@@ -812,7 +812,7 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk, sk->sk_protocol,inet_sk_flowi_flags (sk), (opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr, ireq->ir_loc_addr, ireq->ir_rmt_port, - htons(ireq->ir_num), sk->sk_uid); + htons(ireq->ir_num), sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);if (IS_ERR (rt))
@@ -849,7 +849,7 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, sk->sk_protocol,inet_sk_flowi_flags (sk), (opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr, ireq->ir_loc_addr, ireq->ir_rmt_port, - htons(ireq->ir_num), sk->sk_uid); + htons(ireq->ir_num), sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);if (IS_ERR (rt))
net/ipv4/ping.c +1 -1
@@ -781,7 +781,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)flowi4_init_output (&fl4, ipc.oif, ipc.sockc.mark, ipc.tos &INET_DSCP_MASK , scope, sk->sk_protocol,inet_sk_flowi_flags (sk), faddr, - saddr,0 ,0 , sk->sk_uid); + saddr,0 ,0 ,sk_uid (sk)); fl4.fl4_icmp_type = user_icmph.type; fl4.fl4_icmp_code = user_icmph.code;
net/ipv4/raw.c +1 -1
@@ -610,7 +610,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) hdrincl ? ipc.protocol : sk->sk_protocol,inet_sk_flowi_flags (sk) | (hdrincl ?FLOWI_FLAG_KNOWN_NH :0 ), - daddr, saddr, 0, 0, sk->sk_uid); + daddr, saddr, 0, 0, sk_uid(sk)); fl4.fl4_icmp_type =0 ; fl4.fl4_icmp_code =0 ;
net/ipv4/route.c +2 -1
@@ -556,7 +556,8 @@ static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)inet_test_bit (HDRINCL , sk) ?IPPROTO_RAW : sk->sk_protocol,inet_sk_flowi_flags (sk), - daddr, inet->inet_saddr, 0, 0, sk->sk_uid); + daddr, inet->inet_saddr,0 ,0 , + sk_uid(sk));rcu_read_unlock (); }
net/ipv4/syncookies.c +2 -1
@@ -454,7 +454,8 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)ip_sock_rt_tos (sk),ip_sock_rt_scope (sk),IPPROTO_TCP ,inet_sk_flowi_flags (sk), opt->srr ? opt->faddr : ireq->ir_rmt_addr, - ireq->ir_loc_addr, th->source, th->dest, sk->sk_uid); + ireq->ir_loc_addr, th->source, th->dest, + sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (&fl4)); rt =ip_route_output_key (net, &fl4);if (IS_ERR (rt)) {
net/ipv4/udp.c +2 -1
@@ -1445,7 +1445,8 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)flowi4_init_output (fl4, ipc.oif, ipc.sockc.mark, ipc.tos &INET_DSCP_MASK , scope, sk->sk_protocol, flow_flags, faddr, saddr, - dport, inet->inet_sport, sk->sk_uid); + dport, inet->inet_sport, +sk_uid (sk));security_sk_classify_flow (sk,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);
net/ipv6/af_inet6.c +1 -1
@@ -842,7 +842,7 @@ int inet6_sk_rebuild_header(struct sock *sk) fl6.flowi6_mark = sk->sk_mark; fl6.fl6_dport = inet->inet_dport; fl6.fl6_sport = inet->inet_sport; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);security_sk_classify_flow (sk,flowi6_to_flowi_common (&fl6));rcu_read_lock ();
net/ipv6/datagram.c +1 -1
@@ -53,7 +53,7 @@ static void ip6_datagram_flow_key_init(struct flowi6 *fl6, fl6->fl6_dport = inet->inet_dport; fl6->fl6_sport = inet->inet_sport; fl6->flowlabel =ip6_make_flowinfo (np->tclass, np->flow_label); - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);if (!oif) oif = np->sticky_pktinfo.ipi6_ifindex;
net/ipv6/inet6_connection_sock.c +2 -2
@@ -45,7 +45,7 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk, fl6->flowi6_mark = ireq->ir_mark; fl6->fl6_dport = ireq->ir_rmt_port; fl6->fl6_sport =htons (ireq->ir_num); - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);security_req_classify_flow (req,flowi6_to_flowi_common (fl6)); dst =ip6_dst_lookup_flow (sock_net (sk), sk, fl6, final_p);
@@ -79,7 +79,7 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk, fl6->flowi6_mark = sk->sk_mark; fl6->fl6_sport = inet->inet_sport; fl6->fl6_dport = inet->inet_dport; - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);security_sk_classify_flow (sk,flowi6_to_flowi_common (fl6));rcu_read_lock ();
net/ipv6/ping.c +1 -1
@@ -142,7 +142,7 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) fl6.saddr = np->saddr; fl6.daddr = *daddr; fl6.flowi6_mark = ipc6.sockc.mark; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk); fl6.fl6_icmp_type = user_icmph.icmp6_type; fl6.fl6_icmp_code = user_icmph.icmp6_code;security_sk_classify_flow (sk,flowi6_to_flowi_common (&fl6));
net/ipv6/raw.c +1 -1
@@ -777,7 +777,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)memset (&fl6,0 ,sizeof (fl6)); fl6.flowi6_mark = ipc6.sockc.mark; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);if (sin6) {if (addr_len <SIN6_LEN_RFC2133 )
net/ipv6/route.c +2 -2
@@ -3011,7 +3011,7 @@ void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu) oif =l3mdev_master_ifindex (skb->dev);ip6_update_pmtu (skb,sock_net (sk), mtu, oif,READ_ONCE (sk->sk_mark), - sk->sk_uid); +sk_uid (sk)); dst =__sk_dst_get (sk); if (!dst || !dst->obsolete ||
@@ -3233,7 +3233,7 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif)void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk) {ip6_redirect (skb,sock_net (sk), sk->sk_bound_dev_if, -READ_ONCE (sk->sk_mark), sk->sk_uid); +READ_ONCE (sk->sk_mark),sk_uid (sk)); }EXPORT_SYMBOL_GPL (ip6_sk_redirect);
net/ipv6/syncookies.c +1 -1
@@ -236,7 +236,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) fl6.flowi6_mark = ireq->ir_mark; fl6.fl6_dport = ireq->ir_rmt_port; fl6.fl6_sport =inet_sk (sk)->inet_sport; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);security_req_classify_flow (req,flowi6_to_flowi_common (&fl6)); dst =ip6_dst_lookup_flow (net, sk, &fl6, final_p);
net/ipv6/tcp_ipv6.c +1 -1
@@ -269,7 +269,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, fl6.fl6_sport = inet->inet_sport;if (IS_ENABLED (CONFIG_IP_ROUTE_MULTIPATH ) && !fl6.fl6_sport) fl6.flowi6_flags =FLOWI_FLAG_ANY_SPORT ; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk); opt =rcu_dereference_protected (np->opt,lockdep_sock_is_held (sk)); final_p =fl6_update_dst (&fl6, opt, &final);
net/ipv6/udp.c +3 -2
@@ -750,7 +750,8 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (type ==NDISC_REDIRECT ) {if (tunnel) {ip6_redirect (skb,sock_net (sk),inet6_iif (skb), -READ_ONCE (sk->sk_mark), sk->sk_uid); +READ_ONCE (sk->sk_mark), +sk_uid (sk)); }else {ip6_sk_redirect (skb, sk); }
@@ -1620,7 +1621,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (!fl6->flowi6_oif) fl6->flowi6_oif = np->sticky_pktinfo.ipi6_ifindex; - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);if (msg->msg_controllen) { opt = &opt_space;
net/l2tp/l2tp_ip6.c +1 -1
@@ -545,7 +545,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)memset (&fl6,0 ,sizeof (fl6)); fl6.flowi6_mark =READ_ONCE (sk->sk_mark); - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);ipcm6_init_sk (&ipc6, sk);
net/mptcp/protocol.c +1 -1
@@ -3503,7 +3503,7 @@ void mptcp_sock_graft(struct sock *sk, struct socket *parent)write_lock_bh (&sk->sk_callback_lock);rcu_assign_pointer (sk->sk_wq, &parent->wq);sk_set_socket (sk, parent); - sk->sk_uid =SOCK_INODE (parent)->i_uid; +WRITE_ONCE (sk->sk_uid,SOCK_INODE (parent)->i_uid);write_unlock_bh (&sk->sk_callback_lock); }
net/socket.c +5 -3
@@ -592,10 +592,12 @@ static int sockfs_setattr(struct mnt_idmap *idmap,if (!err && (iattr->ia_valid &ATTR_UID )) {struct socket *sock =SOCKET_I (d_inode (dentry)); -if (sock->sk) - sock->sk->sk_uid = iattr->ia_uid; -else +if (sock->sk) { +/* Paired with READ_ONCE() in sk_uid() */ +WRITE_ONCE (sock->sk->sk_uid, iattr->ia_uid); + }else { err = -ENOENT ; + } }return err;
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
Re: [PATCH net-next 1/2] net: annotate races around sk->sk_uid
Quoted 378 lines · Eric Dumazet
sk->sk_uidcan be read while another thread changes its value insockfs_setattr().Add
sk_uid(const struct sock *sk)helper to factorize the neededREAD_ONCE()annotations, and add correspondingWRITE_ONCE()where needed.Fixes 86741ec25462 ("net: core: Add a UID field to struct sock.")Signed-off-by Eric Dumazet <[email protected]>Cc Lorenzo Colitti <[email protected]>--- include/net/route.h | 4 ++-- include/net/sock.h | 12 ++++++++++-- net/ipv4/inet_connection_sock.c | 4 ++-- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 3 ++- net/ipv4/syncookies.c | 3 ++- net/ipv4/udp.c | 3 ++- net/ipv6/af_inet6.c | 2 +- net/ipv6/datagram.c | 2 +- net/ipv6/inet6_connection_sock.c | 4 ++-- net/ipv6/ping.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 4 ++-- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 5 +++-- net/l2tp/l2tp_ip6.c | 2 +- net/mptcp/protocol.c | 2 +- net/socket.c | 8 +++++--- 20 files changed, 42 insertions(+), 28 deletions(-)include/net/route.h +2
-2@@ -153,7 +153,7 @@ static inline void inet_sk_init_flowi4(const struct inet_sock *inet,ip_sock_rt_tos (sk),ip_sock_rt_scope (sk), sk->sk_protocol,inet_sk_flowi_flags (sk), daddr, inet->inet_saddr, inet->inet_dport, - inet->inet_sport, sk->sk_uid); + inet->inet_sport, sk_uid(sk));security_sk_classify_flow (sk,flowi4_to_flowi_common (fl4)); }@@ -331,7 +331,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst,flowi4_init_output (fl4, oif,READ_ONCE (sk->sk_mark),ip_sock_rt_tos (sk),ip_sock_rt_scope (sk), protocol, flow_flags, dst, - src, dport, sport, sk->sk_uid); + src, dport, sport,sk_uid (sk)); } static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst,include/net/sock.h +10
-2@@ -2076,6 +2076,7 @@ static inline void sock_orphan(struct sock *sk)sock_set_flag (sk,SOCK_DEAD );sk_set_socket (sk,NULL ); sk->sk_wq =NULL ; +/* Note: sk_uid is unchanged. */ write_unlock_bh (&sk->sk_callback_lock); }@@ -2086,18 +2087,25 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)rcu_assign_pointer (sk->sk_wq, &parent->wq); parent->sk = sk;sk_set_socket (sk, parent); - sk->sk_uid =SOCK_INODE (parent)->i_uid; +WRITE_ONCE (sk->sk_uid,SOCK_INODE (parent)->i_uid);security_sock_graft (sk, parent);write_unlock_bh (&sk->sk_callback_lock); }kuid_t sock_i_uid (struct sock *sk); + +static inline kuid_t sk_uid (const struct sock *sk) +{ +/* Paired with WRITE_ONCE() in sockfs_setattr() */ +return READ_ONCE (sk->sk_uid); +} +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk) { -return sk ? sk->sk_uid :make_kuid (net->user_ns,0 ); +return sk ?sk_uid (sk) :make_kuid (net->user_ns,0 ); }static inline u32 net_tx_rndhash (void )net/ipv4/inet_connection_sock.c +2
-2@@ -812,7 +812,7 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk, sk->sk_protocol,inet_sk_flowi_flags (sk), (opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr, ireq->ir_loc_addr, ireq->ir_rmt_port, - htons(ireq->ir_num), sk->sk_uid); + htons(ireq->ir_num), sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);if (IS_ERR (rt))@@ -849,7 +849,7 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, sk->sk_protocol,inet_sk_flowi_flags (sk), (opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr, ireq->ir_loc_addr, ireq->ir_rmt_port, - htons(ireq->ir_num), sk->sk_uid); + htons(ireq->ir_num), sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);if (IS_ERR (rt))net/ipv4/ping.c +1
-1@@ -781,7 +781,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)flowi4_init_output (&fl4, ipc.oif, ipc.sockc.mark, ipc.tos &INET_DSCP_MASK , scope, sk->sk_protocol,inet_sk_flowi_flags (sk), faddr, - saddr,0 ,0 , sk->sk_uid); + saddr,0 ,0 ,sk_uid (sk)); fl4.fl4_icmp_type = user_icmph.type; fl4.fl4_icmp_code = user_icmph.code;net/ipv4/raw.c +1
-1@@ -610,7 +610,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) hdrincl ? ipc.protocol : sk->sk_protocol,inet_sk_flowi_flags (sk) | (hdrincl ?FLOWI_FLAG_KNOWN_NH :0 ), - daddr, saddr, 0, 0, sk->sk_uid); + daddr, saddr, 0, 0, sk_uid(sk)); fl4.fl4_icmp_type =0 ; fl4.fl4_icmp_code =0 ;net/ipv4/route.c +2
-1@@ -556,7 +556,8 @@ static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)inet_test_bit (HDRINCL , sk) ?IPPROTO_RAW : sk->sk_protocol,inet_sk_flowi_flags (sk), - daddr, inet->inet_saddr, 0, 0, sk->sk_uid); + daddr, inet->inet_saddr,0 ,0 , + sk_uid(sk));rcu_read_unlock (); }net/ipv4/syncookies.c +2
-1@@ -454,7 +454,8 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)ip_sock_rt_tos (sk),ip_sock_rt_scope (sk),IPPROTO_TCP ,inet_sk_flowi_flags (sk), opt->srr ? opt->faddr : ireq->ir_rmt_addr, - ireq->ir_loc_addr, th->source, th->dest, sk->sk_uid); + ireq->ir_loc_addr, th->source, th->dest, + sk_uid(sk));security_req_classify_flow (req,flowi4_to_flowi_common (&fl4)); rt =ip_route_output_key (net, &fl4);if (IS_ERR (rt)) {net/ipv4/udp.c +2
-1@@ -1445,7 +1445,8 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)flowi4_init_output (fl4, ipc.oif, ipc.sockc.mark, ipc.tos &INET_DSCP_MASK , scope, sk->sk_protocol, flow_flags, faddr, saddr, - dport, inet->inet_sport, sk->sk_uid); + dport, inet->inet_sport, +sk_uid (sk));security_sk_classify_flow (sk,flowi4_to_flowi_common (fl4)); rt =ip_route_output_flow (net, fl4, sk);net/ipv6/af_inet6.c +1
-1@@ -842,7 +842,7 @@ int inet6_sk_rebuild_header(struct sock *sk) fl6.flowi6_mark = sk->sk_mark; fl6.fl6_dport = inet->inet_dport; fl6.fl6_sport = inet->inet_sport; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);security_sk_classify_flow (sk,flowi6_to_flowi_common (&fl6));rcu_read_lock ();net/ipv6/datagram.c +1
-1@@ -53,7 +53,7 @@ static void ip6_datagram_flow_key_init(struct flowi6 *fl6, fl6->fl6_dport = inet->inet_dport; fl6->fl6_sport = inet->inet_sport; fl6->flowlabel =ip6_make_flowinfo (np->tclass, np->flow_label); - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);if (!oif) oif = np->sticky_pktinfo.ipi6_ifindex;net/ipv6/inet6_connection_sock.c +2
-2@@ -45,7 +45,7 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk, fl6->flowi6_mark = ireq->ir_mark; fl6->fl6_dport = ireq->ir_rmt_port; fl6->fl6_sport =htons (ireq->ir_num); - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);security_req_classify_flow (req,flowi6_to_flowi_common (fl6)); dst =ip6_dst_lookup_flow (sock_net (sk), sk, fl6, final_p);@@ -79,7 +79,7 @@ static struct dst_entry *inet6_csk_route_socket(struct sock *sk, fl6->flowi6_mark = sk->sk_mark; fl6->fl6_sport = inet->inet_sport; fl6->fl6_dport = inet->inet_dport; - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);security_sk_classify_flow (sk,flowi6_to_flowi_common (fl6));rcu_read_lock ();net/ipv6/ping.c +1
-1@@ -142,7 +142,7 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) fl6.saddr = np->saddr; fl6.daddr = *daddr; fl6.flowi6_mark = ipc6.sockc.mark; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk); fl6.fl6_icmp_type = user_icmph.icmp6_type; fl6.fl6_icmp_code = user_icmph.icmp6_code;security_sk_classify_flow (sk,flowi6_to_flowi_common (&fl6));net/ipv6/raw.c +1
-1@@ -777,7 +777,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)memset (&fl6,0 ,sizeof (fl6)); fl6.flowi6_mark = ipc6.sockc.mark; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);if (sin6) {if (addr_len <SIN6_LEN_RFC2133 )net/ipv6/route.c +2
-2@@ -3011,7 +3011,7 @@ void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu) oif =l3mdev_master_ifindex (skb->dev);ip6_update_pmtu (skb,sock_net (sk), mtu, oif,READ_ONCE (sk->sk_mark), - sk->sk_uid); +sk_uid (sk)); dst =__sk_dst_get (sk); if (!dst || !dst->obsolete ||@@ -3233,7 +3233,7 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif)void ip6_sk_redirect (struct sk_buff *skb,struct sock *sk) {ip6_redirect (skb,sock_net (sk), sk->sk_bound_dev_if, -READ_ONCE (sk->sk_mark), sk->sk_uid); +READ_ONCE (sk->sk_mark),sk_uid (sk)); }EXPORT_SYMBOL_GPL (ip6_sk_redirect);net/ipv6/syncookies.c +1
-1@@ -236,7 +236,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb) fl6.flowi6_mark = ireq->ir_mark; fl6.fl6_dport = ireq->ir_rmt_port; fl6.fl6_sport =inet_sk (sk)->inet_sport; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);security_req_classify_flow (req,flowi6_to_flowi_common (&fl6)); dst =ip6_dst_lookup_flow (net, sk, &fl6, final_p);net/ipv6/tcp_ipv6.c +1
-1@@ -269,7 +269,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, fl6.fl6_sport = inet->inet_sport;if (IS_ENABLED (CONFIG_IP_ROUTE_MULTIPATH ) && !fl6.fl6_sport) fl6.flowi6_flags =FLOWI_FLAG_ANY_SPORT ; - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk); opt =rcu_dereference_protected (np->opt,lockdep_sock_is_held (sk)); final_p =fl6_update_dst (&fl6, opt, &final);net/ipv6/udp.c +3
-2@@ -750,7 +750,8 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (type ==NDISC_REDIRECT ) {if (tunnel) {ip6_redirect (skb,sock_net (sk),inet6_iif (skb), -READ_ONCE (sk->sk_mark), sk->sk_uid); +READ_ONCE (sk->sk_mark), +sk_uid (sk)); }else {ip6_sk_redirect (skb, sk); }@@ -1620,7 +1621,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (!fl6->flowi6_oif) fl6->flowi6_oif = np->sticky_pktinfo.ipi6_ifindex; - fl6->flowi6_uid = sk->sk_uid; + fl6->flowi6_uid =sk_uid (sk);if (msg->msg_controllen) { opt = &opt_space;net/l2tp/l2tp_ip6.c +1
-1@@ -545,7 +545,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)memset (&fl6,0 ,sizeof (fl6)); fl6.flowi6_mark =READ_ONCE (sk->sk_mark); - fl6.flowi6_uid = sk->sk_uid; + fl6.flowi6_uid =sk_uid (sk);ipcm6_init_sk (&ipc6, sk);net/mptcp/protocol.c +1
-1@@ -3503,7 +3503,7 @@ void mptcp_sock_graft(struct sock *sk, struct socket *parent)write_lock_bh (&sk->sk_callback_lock);rcu_assign_pointer (sk->sk_wq, &parent->wq);sk_set_socket (sk, parent); - sk->sk_uid =SOCK_INODE (parent)->i_uid; +WRITE_ONCE (sk->sk_uid,SOCK_INODE (parent)->i_uid);write_unlock_bh (&sk->sk_callback_lock); }net/socket.c +5
-4@@ -592,10 +592,12 @@ static int sockfs_setattr(struct mnt_idmap *idmap,if (!err && (iattr->ia_valid &ATTR_UID )) {struct socket *sock =SOCKET_I (d_inode (dentry)); -if (sock->sk) - sock->sk->sk_uid = iattr->ia_uid; -else +if (sock->sk) { +/* Paired with READ_ONCE() in sk_uid() */ +WRITE_ONCE (sock->sk->sk_uid, iattr->ia_uid); + }else { err = -ENOENT ; + } }return err; --
Quoted 2 lines
2.50.0.rc2.701.gf1e915cc24-goog
PATCH 2/2 net: remove sock_i_uid()
In reply to Eric DumazetDifference 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.
--- include/net/sock.h | 2 -- net/appletalk/atalk_proc.c | 2 +- net/bluetooth/af_bluetooth.c | 2 +- net/core/sock.c | 11 ----------- net/ipv4/inet_connection_sock.c | 27 ++++++++++++--------------- net/ipv4/inet_diag.c | 2 +- net/ipv4/inet_hashtables.c | 4 ++-- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv4/udp.c | 16 ++++++++-------- net/ipv6/datagram.c | 2 +- net/ipv6/tcp_ipv6.c | 4 ++-- net/key/af_key.c | 2 +- net/llc/llc_proc.c | 2 +- net/packet/af_packet.c | 2 +- net/packet/diag.c | 2 +- net/phonet/socket.c | 4 ++-- net/sctp/input.c | 2 +- net/sctp/proc.c | 4 ++-- net/sctp/socket.c | 4 ++-- net/smc/smc_diag.c | 2 +- net/tipc/socket.c | 2 +- net/unix/af_unix.c | 2 +- net/unix/diag.c | 2 +- net/xdp/xsk_diag.c | 2 +- 26 files changed, 50 insertions(+), 66 deletions(-)
include/net/sock.h +0 -2
@@ -2092,8 +2092,6 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)write_unlock_bh (&sk->sk_callback_lock); } -kuid_t sock_i_uid (struct sock *sk); -static inline kuid_t sk_uid (const struct sock *sk) {/* Paired with WRITE_ONCE() in sockfs_setattr() */
net/appletalk/atalk_proc.c +1 -1
@@ -181,7 +181,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v)sk_wmem_alloc_get (s),sk_rmem_alloc_get (s), s->sk_state, - from_kuid_munged(seq_user_ns(seq), sock_i_uid(s))); + from_kuid_munged(seq_user_ns(seq), sk_uid(s))); out:return 0 ; }
net/bluetooth/af_bluetooth.c +1 -1
@@ -815,7 +815,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)refcount_read (&sk->sk_refcnt),sk_rmem_alloc_get (sk),sk_wmem_alloc_get (sk), -from_kuid (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), bt->parent ? sock_i_ino(bt->parent) : 0LU);
net/core/sock.c +0 -11
@@ -2780,17 +2780,6 @@ void sock_pfree(struct sk_buff *skb)EXPORT_SYMBOL (sock_pfree);#endif /* CONFIG_INET */ -kuid_t sock_i_uid (struct sock *sk) -{ -kuid_t uid; - -read_lock_bh (&sk->sk_callback_lock); - uid = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_uid :GLOBAL_ROOT_UID ; -read_unlock_bh (&sk->sk_callback_lock); -return uid; -} -EXPORT_SYMBOL (sock_i_uid); -unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino;
net/ipv4/inet_connection_sock.c +12 -15
@@ -168,7 +168,7 @@ static bool inet_use_bhash2_on_bind(const struct sock *sk) }static bool inet_bind_conflict (const struct sock *sk,struct sock *sk2, -kuid_t sk_uid,bool relax, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {int bound_dev_if2;
@@ -185,12 +185,12 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2,if (!relax || (!reuseport_ok && sk->sk_reuseport && sk2->sk_reuseport && reuseport_cb_ok && (sk2->sk_state ==TCP_TIME_WAIT || -uid_eq (sk_uid,sock_i_uid (sk2))))) +uid_eq (uid,sk_uid (sk2)))))return true; }else if (!reuseport_ok || !sk->sk_reuseport || !sk2->sk_reuseport || !reuseport_cb_ok || (sk2->sk_state !=TCP_TIME_WAIT && - !uid_eq (sk_uid,sock_i_uid (sk2)))) { + !uid_eq (uid,sk_uid (sk2)))) {return true; } }
@@ -198,7 +198,7 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2, }static bool __inet_bhash2_conflict (const struct sock *sk,struct sock *sk2, -kuid_t sk_uid,bool relax, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {if (ipv6_only_sock (sk2)) {
@@ -211,20 +211,20 @@ static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2,#endif } -return inet_bind_conflict (sk, sk2, sk_uid, relax, +return inet_bind_conflict (sk, sk2, uid, relax, reuseport_cb_ok, reuseport_ok); }static bool inet_bhash2_conflict (const struct sock *sk,const struct inet_bind2_bucket *tb2, -kuid_t sk_uid, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {struct sock *sk2;sk_for_each_bound (sk2, &tb2->owners) { -if (__inet_bhash2_conflict (sk, sk2, sk_uid, relax, +if (__inet_bhash2_conflict (sk, sk2, uid, relax, reuseport_cb_ok, reuseport_ok))return true; }
@@ -242,8 +242,8 @@ static int inet_csk_bind_conflict(const struct sock *sk,const struct inet_bind2_bucket *tb2,/* may be null */ bool relax, bool reuseport_ok) { - kuid_t uid = sock_i_uid((struct sock *)sk); struct sock_reuseport *reuseport_cb; +kuid_t uid =sk_uid (sk);bool reuseport_cb_ok;struct sock *sk2;
@@ -287,11 +287,11 @@ static int inet_csk_bind_conflict(const struct sock *sk,static bool inet_bhash2_addr_any_conflict (const struct sock *sk,int port,int l3mdev,bool relax,bool reuseport_ok) { -kuid_t uid =sock_i_uid ((struct sock *)sk);const struct net *net =sock_net (sk);struct sock_reuseport *reuseport_cb;struct inet_bind_hashbucket *head2;struct inet_bind2_bucket *tb2; +kuid_t uid =sk_uid (sk);bool conflict = false;bool reuseport_cb_ok;
@@ -425,15 +425,13 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,static inline int sk_reuseport_match (struct inet_bind_bucket *tb,struct sock *sk) { -kuid_t uid =sock_i_uid (sk); -if (tb->fastreuseport <=0 )return 0 ;if (!sk->sk_reuseport)return 0 ;if (rcu_access_pointer (sk->sk_reuseport_cb))return 0 ; -if (!uid_eq (tb->fastuid, uid)) +if (!uid_eq (tb->fastuid,sk_uid (sk)))return 0 ;/* We only need to check the rcv_saddr if this tb was once marked * without fastreuseport and then was reset, as we can only know that
@@ -458,14 +456,13 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb,void inet_csk_update_fastreuse (struct inet_bind_bucket *tb,struct sock *sk) { -kuid_t uid =sock_i_uid (sk);bool reuse = sk->sk_reuse && sk->sk_state !=TCP_LISTEN ;if (hlist_empty (&tb->bhash2)) { tb->fastreuse = reuse;if (sk->sk_reuseport) { tb->fastreuseport =FASTREUSEPORT_ANY ; - tb->fastuid = uid; + tb->fastuid =sk_uid (sk); tb->fast_rcv_saddr = sk->sk_rcv_saddr; tb->fast_ipv6_only =ipv6_only_sock (sk); tb->fast_sk_family = sk->sk_family;
@@ -492,7 +489,7 @@ void inet_csk_update_fastreuse(struct inet_bind_bucket *tb,*/ if (!sk_reuseport_match (tb, sk)) { tb->fastreuseport =FASTREUSEPORT_STRICT ; - tb->fastuid = uid; + tb->fastuid =sk_uid (sk); tb->fast_rcv_saddr = sk->sk_rcv_saddr; tb->fast_ipv6_only =ipv6_only_sock (sk); tb->fast_sk_family = sk->sk_family;
net/ipv4/inet_diag.c +1 -1
@@ -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));
net/ipv4/inet_hashtables.c +2 -2
@@ -721,8 +721,8 @@ static int inet_reuseport_add_sock(struct sock *sk, {struct inet_bind_bucket *tb =inet_csk (sk)->icsk_bind_hash;const struct hlist_nulls_node *node; +kuid_t uid =sk_uid (sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);sk_nulls_for_each_rcu (sk2, node, &ilb->nulls_head) { if (sk2 != sk &&
@@ -730,7 +730,7 @@ static int inet_reuseport_add_sock(struct sock *sk, ipv6_only_sock(sk2) == ipv6_only_sock(sk) && sk2->sk_bound_dev_if == sk->sk_bound_dev_if && inet_csk(sk2)->icsk_bind_hash == tb && - sk2->sk_reuseport && uid_eq(uid, sock_i_uid(sk2)) && + sk2->sk_reuseport && uid_eq(uid, sk_uid(sk2)) && inet_rcv_saddr_equal(sk, sk2, false))return reuseport_add_sock (sk, sk2,inet_rcv_saddr_any (sk));
net/ipv4/ping.c +1 -1
@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (f),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp),refcount_read (&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
net/ipv4/raw.c +1 -1
@@ -1043,7 +1043,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops)); }
net/ipv4/tcp_ipv4.c +4 -4
@@ -2896,7 +2896,7 @@ static void get_openreq4(const struct request_sock *req,jiffies_delta_to_clock_t (delta), req->num_timeout,from_kuid_munged (seq_user_ns (f), -sock_i_uid (req->rsk_listener)), +sk_uid (req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ 0,
@@ -2954,7 +2954,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), icsk->icsk_retransmits, -from_kuid_munged (seq_user_ns (f),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (f),sk_uid (sk)), icsk->icsk_probes_out,sock_i_ino (sk), refcount_read(&sk->sk_refcnt), sk,
@@ -3246,9 +3246,9 @@ static int bpf_iter_tcp_seq_show(struct seq_file *seq, void *v)const struct request_sock *req = v; uid =from_kuid_munged (seq_user_ns (seq), -sock_i_uid (req->rsk_listener)); +sk_uid (req->rsk_listener)); }else { - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); } meta.seq = seq;
net/ipv4/udp.c +8 -8
@@ -145,8 +145,8 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num,unsigned long *bitmap, struct sock *sk, unsigned int log) { + kuid_t uid = sk_uid(sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);sk_for_each (sk2, &hslot->head) { if (net_eq(sock_net(sk2), net) &&
@@ -158,7 +158,7 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num, inet_rcv_saddr_equal(sk, sk2, true)) {if (sk2->sk_reuseport && sk->sk_reuseport && !rcu_access_pointer (sk->sk_reuseport_cb) && -uid_eq (uid,sock_i_uid (sk2))) { +uid_eq (uid,sk_uid (sk2))) {if (!bitmap)return 0 ; }else {
@@ -180,8 +180,8 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,struct udp_hslot *hslot2, struct sock *sk) { + kuid_t uid = sk_uid(sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);int res =0 ;spin_lock (&hslot2->lock);
@@ -195,7 +195,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num, inet_rcv_saddr_equal(sk, sk2, true)) {if (sk2->sk_reuseport && sk->sk_reuseport && !rcu_access_pointer (sk->sk_reuseport_cb) && -uid_eq (uid,sock_i_uid (sk2))) { +uid_eq (uid,sk_uid (sk2))) { res =0 ; }else { res =1 ;
@@ -210,7 +210,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,static int udp_reuseport_add_sock (struct sock *sk,struct udp_hslot *hslot) {struct net *net =sock_net (sk); -kuid_t uid =sock_i_uid (sk); +kuid_t uid =sk_uid (sk);struct sock *sk2;sk_for_each (sk2, &hslot->head) {
@@ -220,7 +220,7 @@ static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot) ipv6_only_sock(sk2) == ipv6_only_sock(sk) && (udp_sk(sk2)->udp_port_hash == udp_sk(sk)->udp_port_hash) && (sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && - sk2->sk_reuseport && uid_eq(uid, sock_i_uid(sk2)) && + sk2->sk_reuseport && uid_eq(uid, sk_uid(sk2)) && inet_rcv_saddr_equal(sk, sk2, false)) {return reuseport_add_sock (sk, sk2,inet_rcv_saddr_any (sk));
@@ -3387,7 +3387,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,sk_wmem_alloc_get (sp),udp_rqueue_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (f),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp),refcount_read (&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
@@ -3630,7 +3630,7 @@ static int bpf_iter_udp_seq_show(struct seq_file *seq, void *v) goto unlock; } - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); meta.seq = seq; prog =bpf_iter_get_info (&meta, false); ret =udp_prog_seq_show (prog, &meta, v, uid, state->bucket);
net/ipv6/datagram.c +1 -1
@@ -1064,7 +1064,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,sk_wmem_alloc_get (sp), rqueue,0 ,0L ,0 , -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp,
net/ipv6/tcp_ipv6.c +2 -2
@@ -2168,7 +2168,7 @@ static void get_openreq6(struct seq_file *seq,jiffies_to_clock_t (ttd), req->num_timeout,from_kuid_munged (seq_user_ns (seq), -sock_i_uid (req->rsk_listener)), +sk_uid (req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ 0, req);
@@ -2234,7 +2234,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), icsk->icsk_retransmits, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)), icsk->icsk_probes_out,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp,
net/key/af_key.c +1 -1
@@ -3788,7 +3788,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)refcount_read (&s->sk_refcnt),sk_rmem_alloc_get (s),sk_wmem_alloc_get (s), -from_kuid_munged (seq_user_ns (f),sock_i_uid (s)), +from_kuid_munged (seq_user_ns (f),sk_uid (s)),sock_i_ino (s) );return 0 ;
net/llc/llc_proc.c +1 -1
@@ -151,7 +151,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk) - llc->copied_seq, sk->sk_state, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)), llc->link); out:return 0 ;
net/packet/af_packet.c +1 -1
@@ -4783,7 +4783,7 @@ static int packet_seq_show(struct seq_file *seq, void *v)READ_ONCE (po->ifindex),packet_sock_flag (po,PACKET_SOCK_RUNNING ),atomic_read (&s->sk_rmem_alloc), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (s)), +from_kuid_munged (seq_user_ns (seq),sk_uid (s)), sock_i_ino(s)); }
net/packet/diag.c +1 -1
@@ -153,7 +153,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,if ((req->pdiag_show &PACKET_SHOW_INFO ) &&nla_put_u32 (skb,PACKET_DIAG_UID , -from_kuid_munged (user_ns,sock_i_uid (sk)))) +from_kuid_munged (user_ns,sk_uid (sk)))) goto out_nlmsg_trim; if ((req->pdiag_show & PACKET_SHOW_MCLIST) &&
net/phonet/socket.c +2 -2
@@ -584,7 +584,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v) sk->sk_protocol, pn->sobject, pn->dobject, pn->resource, sk->sk_state,sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk),refcount_read (&sk->sk_refcnt), sk, atomic_read(&sk->sk_drops));
@@ -755,7 +755,7 @@ static int pn_res_seq_show(struct seq_file *seq, void *v)seq_printf (seq,"%02X %5u %lu" , (int ) (psk - pnres.sk), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk)); }seq_pad (seq,'\n' );
net/sctp/input.c +1 -1
@@ -756,7 +756,7 @@ static int __sctp_hash_endpoint(struct sctp_endpoint *ep)struct sock *sk2 = ep2->base.sk;if (!net_eq (sock_net (sk2), net) || sk2 == sk || - !uid_eq (sock_i_uid (sk2),sock_i_uid (sk)) || + !uid_eq (sk_uid (sk2),sk_uid (sk)) || !sk2->sk_reuseport)continue ;
net/sctp/proc.c +2 -2
@@ -177,7 +177,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)seq_printf (seq,"%8pK %8pK %-3d %-3d %-4d %-5d %5u %5lu " , ep, sk,sctp_sk (sk)->type, sk->sk_state, hash, ep->base.bind_addr.port, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk));sctp_seq_dump_local_addrs (seq, &ep->base);
@@ -267,7 +267,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) assoc->assoc_id, assoc->sndbuf_used,atomic_read (&assoc->rmem_alloc), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), epb->bind_addr.port, assoc->peer.port);
net/sctp/socket.c +2 -2
@@ -8345,8 +8345,8 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)bool reuse = (sk->sk_reuse || sp->reuse);struct sctp_bind_hashbucket *head;/* hash list */ struct net *net =sock_net (sk); -kuid_t uid =sock_i_uid (sk);struct sctp_bind_bucket *pp; +kuid_t uid =sk_uid (sk);unsigned short snum;int ret;
@@ -8444,7 +8444,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) (reuse && (sk2->sk_reuse || sp2->reuse) && sk2->sk_state !=SCTP_SS_LISTENING ) || (sk->sk_reuseport && sk2->sk_reuseport && - uid_eq(uid, sock_i_uid(sk2)))) + uid_eq(uid, sk_uid(sk2)))) continue; if ((!sk->sk_bound_dev_if || !bound_dev_if2 ||
net/smc/smc_diag.c +1 -1
@@ -64,7 +64,7 @@ static int smc_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,if (nla_put_u8 (skb,SMC_DIAG_SHUTDOWN , sk->sk_shutdown))return 1 ; - r->diag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); + r->diag_uid =from_kuid_munged (user_ns,sk_uid (sk)); r->diag_inode =sock_i_ino (sk);return 0 ; }
net/tipc/socket.c +1 -1
@@ -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))
net/unix/af_unix.c +1 -1
@@ -3682,7 +3682,7 @@ static int bpf_iter_unix_seq_show(struct seq_file *seq, void *v) goto unlock; } - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); meta.seq = seq; prog =bpf_iter_get_info (&meta, false); ret =unix_prog_seq_show (prog, &meta, v, uid);
net/unix/diag.c +1 -1
@@ -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); }
net/xdp/xsk_diag.c +1 -1
@@ -119,7 +119,7 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff *nlskb,if ((req->xdiag_show &XDP_SHOW_INFO ) &&nla_put_u32 (nlskb,XDP_DIAG_UID , -from_kuid_munged (user_ns,sock_i_uid (sk)))) +from_kuid_munged (user_ns,sk_uid (sk)))) goto out_nlmsg_trim; if ((req->xdiag_show & XDP_SHOW_RING_CFG) &&
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
Re: [PATCH net-next 2/2] net: remove sock_i_uid()
Quoted 637 lines · Eric Dumazet
Difference between
sock_i_uid()andsk_uid()is that aftersock_orphan(),sock_i_uid()returnsGLOBAL_ROOT_UIDwhilesk_uid()returns the last cachedsk->sk_uidvalue.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]>--- include/net/sock.h | 2 -- net/appletalk/atalk_proc.c | 2 +- net/bluetooth/af_bluetooth.c | 2 +- net/core/sock.c | 11 ----------- net/ipv4/inet_connection_sock.c | 27 ++++++++++++--------------- net/ipv4/inet_diag.c | 2 +- net/ipv4/inet_hashtables.c | 4 ++-- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp_ipv4.c | 8 ++++---- net/ipv4/udp.c | 16 ++++++++-------- net/ipv6/datagram.c | 2 +- net/ipv6/tcp_ipv6.c | 4 ++-- net/key/af_key.c | 2 +- net/llc/llc_proc.c | 2 +- net/packet/af_packet.c | 2 +- net/packet/diag.c | 2 +- net/phonet/socket.c | 4 ++-- net/sctp/input.c | 2 +- net/sctp/proc.c | 4 ++-- net/sctp/socket.c | 4 ++-- net/smc/smc_diag.c | 2 +- net/tipc/socket.c | 2 +- net/unix/af_unix.c | 2 +- net/unix/diag.c | 2 +- net/xdp/xsk_diag.c | 2 +- 26 files changed, 50 insertions(+), 66 deletions(-)include/net/sock.h +0
-2@@ -2092,8 +2092,6 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)write_unlock_bh (&sk->sk_callback_lock); } -kuid_t sock_i_uid (struct sock *sk); -static inline kuid_t sk_uid (const struct sock *sk) {/* Paired with WRITE_ONCE() in sockfs_setattr() */ net/appletalk/atalk_proc.c +1
-1@@ -181,7 +181,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v)sk_wmem_alloc_get (s),sk_rmem_alloc_get (s), s->sk_state, - from_kuid_munged(seq_user_ns(seq), sock_i_uid(s))); + from_kuid_munged(seq_user_ns(seq), sk_uid(s))); out:return 0 ; }net/bluetooth/af_bluetooth.c +1
-1@@ -815,7 +815,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)refcount_read (&sk->sk_refcnt),sk_rmem_alloc_get (sk),sk_wmem_alloc_get (sk), -from_kuid (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), bt->parent ? sock_i_ino(bt->parent) : 0LU);net/core/sock.c +0
-11@@ -2780,17 +2780,6 @@ void sock_pfree(struct sk_buff *skb)EXPORT_SYMBOL (sock_pfree);#endif /* CONFIG_INET */ -kuid_t sock_i_uid (struct sock *sk) -{ -kuid_t uid; - -read_lock_bh (&sk->sk_callback_lock); - uid = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_uid :GLOBAL_ROOT_UID ; -read_unlock_bh (&sk->sk_callback_lock); -return uid; -} -EXPORT_SYMBOL (sock_i_uid); -unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino;net/ipv4/inet_connection_sock.c +12
-15@@ -168,7 +168,7 @@ static bool inet_use_bhash2_on_bind(const struct sock *sk) }static bool inet_bind_conflict (const struct sock *sk,struct sock *sk2, -kuid_t sk_uid,bool relax, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {int bound_dev_if2;@@ -185,12 +185,12 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2,if (!relax || (!reuseport_ok && sk->sk_reuseport && sk2->sk_reuseport && reuseport_cb_ok && (sk2->sk_state ==TCP_TIME_WAIT || -uid_eq (sk_uid,sock_i_uid (sk2))))) +uid_eq (uid,sk_uid (sk2)))))return true; }else if (!reuseport_ok || !sk->sk_reuseport || !sk2->sk_reuseport || !reuseport_cb_ok || (sk2->sk_state !=TCP_TIME_WAIT && - !uid_eq (sk_uid,sock_i_uid (sk2)))) { + !uid_eq (uid,sk_uid (sk2)))) {return true; } }@@ -198,7 +198,7 @@ static bool inet_bind_conflict(const struct sock *sk, struct sock *sk2, }static bool __inet_bhash2_conflict (const struct sock *sk,struct sock *sk2, -kuid_t sk_uid,bool relax, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {if (ipv6_only_sock (sk2)) {@@ -211,20 +211,20 @@ static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2,#endif } -return inet_bind_conflict (sk, sk2, sk_uid, relax, +return inet_bind_conflict (sk, sk2, uid, relax, reuseport_cb_ok, reuseport_ok); }static bool inet_bhash2_conflict (const struct sock *sk,const struct inet_bind2_bucket *tb2, -kuid_t sk_uid, +kuid_t uid,bool relax,bool reuseport_cb_ok,bool reuseport_ok) {struct sock *sk2;sk_for_each_bound (sk2, &tb2->owners) { -if (__inet_bhash2_conflict (sk, sk2, sk_uid, relax, +if (__inet_bhash2_conflict (sk, sk2, uid, relax, reuseport_cb_ok, reuseport_ok))return true; }@@ -242,8 +242,8 @@ static int inet_csk_bind_conflict(const struct sock *sk,const struct inet_bind2_bucket *tb2,/* may be null */ bool relax, bool reuseport_ok) { - kuid_t uid = sock_i_uid((struct sock *)sk); struct sock_reuseport *reuseport_cb; +kuid_t uid =sk_uid (sk);bool reuseport_cb_ok;struct sock *sk2;@@ -287,11 +287,11 @@ static int inet_csk_bind_conflict(const struct sock *sk,static bool inet_bhash2_addr_any_conflict (const struct sock *sk,int port,int l3mdev,bool relax,bool reuseport_ok) { -kuid_t uid =sock_i_uid ((struct sock *)sk);const struct net *net =sock_net (sk);struct sock_reuseport *reuseport_cb;struct inet_bind_hashbucket *head2;struct inet_bind2_bucket *tb2; +kuid_t uid =sk_uid (sk);bool conflict = false;bool reuseport_cb_ok;@@ -425,15 +425,13 @@ inet_csk_find_open_port(const struct sock *sk, struct inet_bind_bucket **tb_ret,static inline int sk_reuseport_match (struct inet_bind_bucket *tb,struct sock *sk) { -kuid_t uid =sock_i_uid (sk); -if (tb->fastreuseport <=0 )return 0 ;if (!sk->sk_reuseport)return 0 ;if (rcu_access_pointer (sk->sk_reuseport_cb))return 0 ; -if (!uid_eq (tb->fastuid, uid)) +if (!uid_eq (tb->fastuid,sk_uid (sk)))return 0 ;/* We only need to check the rcv_saddr if this tb was once marked * without fastreuseport and then was reset, as we can only know that @@ -458,14 +456,13 @@ static inline int sk_reuseport_match(struct inet_bind_bucket *tb,void inet_csk_update_fastreuse (struct inet_bind_bucket *tb,struct sock *sk) { -kuid_t uid =sock_i_uid (sk);bool reuse = sk->sk_reuse && sk->sk_state !=TCP_LISTEN ;if (hlist_empty (&tb->bhash2)) { tb->fastreuse = reuse;if (sk->sk_reuseport) { tb->fastreuseport =FASTREUSEPORT_ANY ; - tb->fastuid = uid; + tb->fastuid =sk_uid (sk); tb->fast_rcv_saddr = sk->sk_rcv_saddr; tb->fast_ipv6_only =ipv6_only_sock (sk); tb->fast_sk_family = sk->sk_family;@@ -492,7 +489,7 @@ void inet_csk_update_fastreuse(struct inet_bind_bucket *tb,*/ if (!sk_reuseport_match (tb, sk)) { tb->fastreuseport =FASTREUSEPORT_STRICT ; - tb->fastuid = uid; + tb->fastuid =sk_uid (sk); tb->fast_rcv_saddr = sk->sk_rcv_saddr; tb->fast_ipv6_only =ipv6_only_sock (sk); tb->fast_sk_family = sk->sk_family;net/ipv4/inet_diag.c +1
-1@@ -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));net/ipv4/inet_hashtables.c +2
-2@@ -721,8 +721,8 @@ static int inet_reuseport_add_sock(struct sock *sk, {struct inet_bind_bucket *tb =inet_csk (sk)->icsk_bind_hash;const struct hlist_nulls_node *node; +kuid_t uid =sk_uid (sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);sk_nulls_for_each_rcu (sk2, node, &ilb->nulls_head) { if (sk2 != sk &&@@ -730,7 +730,7 @@ static int inet_reuseport_add_sock(struct sock *sk, ipv6_only_sock(sk2) == ipv6_only_sock(sk) && sk2->sk_bound_dev_if == sk->sk_bound_dev_if && inet_csk(sk2)->icsk_bind_hash == tb && - sk2->sk_reuseport && uid_eq(uid, sock_i_uid(sk2)) && + sk2->sk_reuseport && uid_eq(uid, sk_uid(sk2)) && inet_rcv_saddr_equal(sk, sk2, false))return reuseport_add_sock (sk, sk2,inet_rcv_saddr_any (sk));net/ipv4/ping.c +1
-1@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (f),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp),refcount_read (&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));net/ipv4/raw.c +1
-1@@ -1043,7 +1043,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)sk_wmem_alloc_get (sp),sk_rmem_alloc_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops)); }net/ipv4/tcp_ipv4.c +4
-4@@ -2896,7 +2896,7 @@ static void get_openreq4(const struct request_sock *req,jiffies_delta_to_clock_t (delta), req->num_timeout,from_kuid_munged (seq_user_ns (f), -sock_i_uid (req->rsk_listener)), +sk_uid (req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ 0,@@ -2954,7 +2954,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), icsk->icsk_retransmits, -from_kuid_munged (seq_user_ns (f),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (f),sk_uid (sk)), icsk->icsk_probes_out,sock_i_ino (sk), refcount_read(&sk->sk_refcnt), sk,@@ -3246,9 +3246,9 @@ static int bpf_iter_tcp_seq_show(struct seq_file *seq, void *v)const struct request_sock *req = v; uid =from_kuid_munged (seq_user_ns (seq), -sock_i_uid (req->rsk_listener)); +sk_uid (req->rsk_listener)); }else { - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); } meta.seq = seq;net/ipv4/udp.c +8
-8@@ -145,8 +145,8 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num,unsigned long *bitmap, struct sock *sk, unsigned int log) { + kuid_t uid = sk_uid(sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);sk_for_each (sk2, &hslot->head) { if (net_eq(sock_net(sk2), net) &&@@ -158,7 +158,7 @@ static int udp_lib_lport_inuse(struct net *net, __u16 num, inet_rcv_saddr_equal(sk, sk2, true)) {if (sk2->sk_reuseport && sk->sk_reuseport && !rcu_access_pointer (sk->sk_reuseport_cb) && -uid_eq (uid,sock_i_uid (sk2))) { +uid_eq (uid,sk_uid (sk2))) {if (!bitmap)return 0 ; }else {@@ -180,8 +180,8 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,struct udp_hslot *hslot2, struct sock *sk) { + kuid_t uid = sk_uid(sk);struct sock *sk2; -kuid_t uid =sock_i_uid (sk);int res =0 ;spin_lock (&hslot2->lock);@@ -195,7 +195,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num, inet_rcv_saddr_equal(sk, sk2, true)) {if (sk2->sk_reuseport && sk->sk_reuseport && !rcu_access_pointer (sk->sk_reuseport_cb) && -uid_eq (uid,sock_i_uid (sk2))) { +uid_eq (uid,sk_uid (sk2))) { res =0 ; }else { res =1 ;@@ -210,7 +210,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,static int udp_reuseport_add_sock (struct sock *sk,struct udp_hslot *hslot) {struct net *net =sock_net (sk); -kuid_t uid =sock_i_uid (sk); +kuid_t uid =sk_uid (sk);struct sock *sk2;sk_for_each (sk2, &hslot->head) {@@ -220,7 +220,7 @@ static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot) ipv6_only_sock(sk2) == ipv6_only_sock(sk) && (udp_sk(sk2)->udp_port_hash == udp_sk(sk)->udp_port_hash) && (sk2->sk_bound_dev_if == sk->sk_bound_dev_if) && - sk2->sk_reuseport && uid_eq(uid, sock_i_uid(sk2)) && + sk2->sk_reuseport && uid_eq(uid, sk_uid(sk2)) && inet_rcv_saddr_equal(sk, sk2, false)) {return reuseport_add_sock (sk, sk2,inet_rcv_saddr_any (sk));@@ -3387,7 +3387,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,sk_wmem_alloc_get (sp),udp_rqueue_get (sp),0 ,0L ,0 , -from_kuid_munged (seq_user_ns (f),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (f),sk_uid (sp)),0 ,sock_i_ino (sp),refcount_read (&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));@@ -3630,7 +3630,7 @@ static int bpf_iter_udp_seq_show(struct seq_file *seq, void *v) goto unlock; } - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); meta.seq = seq; prog =bpf_iter_get_info (&meta, false); ret =udp_prog_seq_show (prog, &meta, v, uid, state->bucket);net/ipv6/datagram.c +1
-1@@ -1064,7 +1064,7 @@ void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,sk_wmem_alloc_get (sp), rqueue,0 ,0L ,0 , -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)),0 ,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp,net/ipv6/tcp_ipv6.c +2
-2@@ -2168,7 +2168,7 @@ static void get_openreq6(struct seq_file *seq,jiffies_to_clock_t (ttd), req->num_timeout,from_kuid_munged (seq_user_ns (seq), -sock_i_uid (req->rsk_listener)), +sk_uid (req->rsk_listener)),0 ,/* non standard timer */ 0 ,/* open_requests have no inode */ 0, req);@@ -2234,7 +2234,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), icsk->icsk_retransmits, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sp)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sp)), icsk->icsk_probes_out,sock_i_ino (sp), refcount_read(&sp->sk_refcnt), sp,net/key/af_key.c +1
-1@@ -3788,7 +3788,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)refcount_read (&s->sk_refcnt),sk_rmem_alloc_get (s),sk_wmem_alloc_get (s), -from_kuid_munged (seq_user_ns (f),sock_i_uid (s)), +from_kuid_munged (seq_user_ns (f),sk_uid (s)),sock_i_ino (s) );return 0 ;net/llc/llc_proc.c +1
-1@@ -151,7 +151,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk) - llc->copied_seq, sk->sk_state, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)), llc->link); out:return 0 ;net/packet/af_packet.c +1
-1@@ -4783,7 +4783,7 @@ static int packet_seq_show(struct seq_file *seq, void *v)READ_ONCE (po->ifindex),packet_sock_flag (po,PACKET_SOCK_RUNNING ),atomic_read (&s->sk_rmem_alloc), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (s)), +from_kuid_munged (seq_user_ns (seq),sk_uid (s)), sock_i_ino(s)); }net/packet/diag.c +1
-1@@ -153,7 +153,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb,if ((req->pdiag_show &PACKET_SHOW_INFO ) &&nla_put_u32 (skb,PACKET_DIAG_UID , -from_kuid_munged (user_ns,sock_i_uid (sk)))) +from_kuid_munged (user_ns,sk_uid (sk)))) goto out_nlmsg_trim; if ((req->pdiag_show & PACKET_SHOW_MCLIST) &&net/phonet/socket.c +2
-2@@ -584,7 +584,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v) sk->sk_protocol, pn->sobject, pn->dobject, pn->resource, sk->sk_state,sk_wmem_alloc_get (sk),sk_rmem_alloc_get (sk), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk),refcount_read (&sk->sk_refcnt), sk, atomic_read(&sk->sk_drops));@@ -755,7 +755,7 @@ static int pn_res_seq_show(struct seq_file *seq, void *v)seq_printf (seq,"%02X %5u %lu" , (int ) (psk - pnres.sk), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk)); }seq_pad (seq,'\n' );net/sctp/input.c +1
-1@@ -756,7 +756,7 @@ static int __sctp_hash_endpoint(struct sctp_endpoint *ep)struct sock *sk2 = ep2->base.sk;if (!net_eq (sock_net (sk2), net) || sk2 == sk || - !uid_eq (sock_i_uid (sk2),sock_i_uid (sk)) || + !uid_eq (sk_uid (sk2),sk_uid (sk)) || !sk2->sk_reuseport)continue ;net/sctp/proc.c +2
-2@@ -177,7 +177,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)seq_printf (seq,"%8pK %8pK %-3d %-3d %-4d %-5d %5u %5lu " , ep, sk,sctp_sk (sk)->type, sk->sk_state, hash, ep->base.bind_addr.port, -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk));sctp_seq_dump_local_addrs (seq, &ep->base);@@ -267,7 +267,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) assoc->assoc_id, assoc->sndbuf_used,atomic_read (&assoc->rmem_alloc), -from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)), +from_kuid_munged (seq_user_ns (seq),sk_uid (sk)),sock_i_ino (sk), epb->bind_addr.port, assoc->peer.port);net/sctp/socket.c +2
-2@@ -8345,8 +8345,8 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr)bool reuse = (sk->sk_reuse || sp->reuse);struct sctp_bind_hashbucket *head;/* hash list */ struct net *net =sock_net (sk); -kuid_t uid =sock_i_uid (sk);struct sctp_bind_bucket *pp; +kuid_t uid =sk_uid (sk);unsigned short snum;int ret;@@ -8444,7 +8444,7 @@ static int sctp_get_port_local(struct sock *sk, union sctp_addr *addr) (reuse && (sk2->sk_reuse || sp2->reuse) && sk2->sk_state !=SCTP_SS_LISTENING ) || (sk->sk_reuseport && sk2->sk_reuseport && - uid_eq(uid, sock_i_uid(sk2)))) + uid_eq(uid, sk_uid(sk2)))) continue; if ((!sk->sk_bound_dev_if || !bound_dev_if2 ||net/smc/smc_diag.c +1
-1@@ -64,7 +64,7 @@ static int smc_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,if (nla_put_u8 (skb,SMC_DIAG_SHUTDOWN , sk->sk_shutdown))return 1 ; - r->diag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); + r->diag_uid =from_kuid_munged (user_ns,sk_uid (sk)); r->diag_inode =sock_i_ino (sk);return 0 ; }net/tipc/socket.c +1
-1@@ -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))net/unix/af_unix.c +1
-1@@ -3682,7 +3682,7 @@ static int bpf_iter_unix_seq_show(struct seq_file *seq, void *v) goto unlock; } - uid =from_kuid_munged (seq_user_ns (seq),sock_i_uid (sk)); + uid =from_kuid_munged (seq_user_ns (seq),sk_uid (sk)); meta.seq = seq; prog =bpf_iter_get_info (&meta, false); ret =unix_prog_seq_show (prog, &meta, v, uid);net/unix/diag.c +1
-1@@ -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); }net/xdp/xsk_diag.c +1
-2@@ -119,7 +119,7 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff *nlskb,if ((req->xdiag_show &XDP_SHOW_INFO ) &&nla_put_u32 (nlskb,XDP_DIAG_UID , -from_kuid_munged (user_ns,sock_i_uid (sk)))) +from_kuid_munged (user_ns,sk_uid (sk)))) goto out_nlmsg_trim; if ((req->xdiag_show & XDP_SHOW_RING_CFG) && --
Quoted 2 lines
2.50.0.rc2.701.gf1e915cc24-goog
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 20 Jun 2025 13:29:59 +0000 you wrote:
First patch annotates
sk->sk_uidaccesses and addssk_uid()helper.Second patch removes
sock_i_uid()in favor of the new helper.Eric Dumazet (2):
net: annotate races aroundsk->sk_uid
net: removesock_i_uid()[...]
Here is the summary with links:
- [net-next,1/2] net: annotate races around sk->sk_uid
https://git.kernel.org/netdev/net-next/c/e84a4927a404 - [net-next,2/2] net: remove sock_i_uid() https://git.kernel.org/netdev/net-next/c/c51da3f7a161
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html