niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: annotate data-races around sk->sk_mark

Browse source 
sk->sk_mark is often read while another thread could change the value.

Fixes: 4a19ec5800 ("[NET]: Introducing socket mark socket option.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2023-07-28 15:03:15 +00:00 • committed by David S. Miller
parent b4b5532530
commit 3c5b4d69c3
23 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/net/inet_sock.h
View file

@ -107,11 +107,12 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb) static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb)
{ {
if (!sk->sk_mark && u32 mark = READ_ONCE(sk->sk_mark);
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept))
if (!mark && READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept))
return skb->mark; return skb->mark;
return sk->sk_mark; return mark;
} }
static inline int inet_request_bound_dev_if(const struct sock *sk, static inline int inet_request_bound_dev_if(const struct sock *sk,

2
include/net/ip.h
View file

@ -93,7 +93,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm,
{ {
ipcm_init(ipcm); ipcm_init(ipcm);
ipcm->sockc.mark = inet->sk.sk_mark; ipcm->sockc.mark = READ_ONCE(inet->sk.sk_mark);
ipcm->sockc.tsflags = inet->sk.sk_tsflags; ipcm->sockc.tsflags = inet->sk.sk_tsflags;
ipcm->oif = READ_ONCE(inet->sk.sk_bound_dev_if); ipcm->oif = READ_ONCE(inet->sk.sk_bound_dev_if);
ipcm->addr = inet->inet_saddr; ipcm->addr = inet->inet_saddr;

4
include/net/route.h
View file

@ -168,7 +168,7 @@ static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi
__be16 dport, __be16 sport, __be16 dport, __be16 sport,
__u8 proto, __u8 tos, int oif) __u8 proto, __u8 tos, int oif)
{ {
flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos, flowi4_init_output(fl4, oif, sk ? READ_ONCE(sk->sk_mark) : 0, tos,
RT_SCOPE_UNIVERSE, proto, RT_SCOPE_UNIVERSE, proto,
sk ? inet_sk_flowi_flags(sk) : 0, sk ? inet_sk_flowi_flags(sk) : 0,
daddr, saddr, dport, sport, sock_net_uid(net, sk)); daddr, saddr, dport, sport, sock_net_uid(net, sk));
@ -301,7 +301,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst,
if (inet_sk(sk)->transparent) if (inet_sk(sk)->transparent)
flow_flags |= FLOWI_FLAG_ANYSRC; flow_flags |= FLOWI_FLAG_ANYSRC;
flowi4_init_output(fl4, oif, sk->sk_mark, ip_sock_rt_tos(sk), flowi4_init_output(fl4, oif, READ_ONCE(sk->sk_mark), ip_sock_rt_tos(sk),
ip_sock_rt_scope(sk), protocol, flow_flags, dst, ip_sock_rt_scope(sk), protocol, flow_flags, dst,
src, dport, sport, sk->sk_uid); src, dport, sport, sk->sk_uid);
} }

2
net/can/raw.c
View file

@ -865,7 +865,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
skb->dev = dev; skb->dev = dev;
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
skb->mark = sk->sk_mark; skb->mark = READ_ONCE(sk->sk_mark);
skb->tstamp = sockc.transmit_time; skb->tstamp = sockc.transmit_time;
skb_setup_tx_timestamp(skb, sockc.tsflags); skb_setup_tx_timestamp(skb, sockc.tsflags);

4
net/core/sock.c
View file

@ -990,7 +990,7 @@ EXPORT_SYMBOL(sock_set_rcvbuf);
static void __sock_set_mark(struct sock *sk, u32 val) static void __sock_set_mark(struct sock *sk, u32 val)
{ {
if (val != sk->sk_mark) { if (val != sk->sk_mark) {
sk->sk_mark = val; WRITE_ONCE(sk->sk_mark, val);
sk_dst_reset(sk); sk_dst_reset(sk);
} }
} }
@ -1851,7 +1851,7 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
optval, optlen, len); optval, optlen, len);
case SO_MARK: case SO_MARK:
v.val = sk->sk_mark; v.val = READ_ONCE(sk->sk_mark);
break; break;
case SO_RCVMARK: case SO_RCVMARK:

4
net/dccp/ipv6.c
View file

@ -238,8 +238,8 @@ static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req
opt = ireq->ipv6_opt; opt = ireq->ipv6_opt;
if (!opt) if (!opt)
opt = rcu_dereference(np->opt); opt = rcu_dereference(np->opt);
err = ip6_xmit(sk, skb, &fl6, sk->sk_mark, opt, np->tclass, err = ip6_xmit(sk, skb, &fl6, READ_ONCE(sk->sk_mark), opt,
sk->sk_priority); np->tclass, sk->sk_priority);
rcu_read_unlock(); rcu_read_unlock();
err = net_xmit_eval(err); err = net_xmit_eval(err);
} }

4
net/ipv4/inet_diag.c
View file

@ -150,7 +150,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
} }
#endif #endif
if (net_admin && nla_put_u32(skb, INET_DIAG_MARK, sk->sk_mark)) if (net_admin && nla_put_u32(skb, INET_DIAG_MARK, READ_ONCE(sk->sk_mark)))
goto errout; goto errout;
if (ext & (1 << (INET_DIAG_CLASS_ID - 1)) || if (ext & (1 << (INET_DIAG_CLASS_ID - 1)) ||
@ -799,7 +799,7 @@ int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk)
entry.ifindex = sk->sk_bound_dev_if; entry.ifindex = sk->sk_bound_dev_if;
entry.userlocks = sk_fullsock(sk) ? sk->sk_userlocks : 0; entry.userlocks = sk_fullsock(sk) ? sk->sk_userlocks : 0;
if (sk_fullsock(sk)) if (sk_fullsock(sk))
entry.mark = sk->sk_mark; entry.mark = READ_ONCE(sk->sk_mark);
else if (sk->sk_state == TCP_NEW_SYN_RECV) else if (sk->sk_state == TCP_NEW_SYN_RECV)
entry.mark = inet_rsk(inet_reqsk(sk))->ir_mark; entry.mark = inet_rsk(inet_reqsk(sk))->ir_mark;
else if (sk->sk_state == TCP_TIME_WAIT) else if (sk->sk_state == TCP_TIME_WAIT)

4
net/ipv4/ip_output.c
View file

@ -186,7 +186,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
if (!skb->mark) if (!skb->mark)
skb->mark = sk->sk_mark; skb->mark = READ_ONCE(sk->sk_mark);
/* Send it out. */ /* Send it out. */
return ip_local_out(net, skb->sk, skb); return ip_local_out(net, skb->sk, skb);
@ -529,7 +529,7 @@ packet_routed:
/* TODO : should we use skb->sk here instead of sk ? */ /* TODO : should we use skb->sk here instead of sk ? */
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
skb->mark = sk->sk_mark; skb->mark = READ_ONCE(sk->sk_mark);
res = ip_local_out(net, sk, skb); res = ip_local_out(net, sk, skb);
rcu_read_unlock(); rcu_read_unlock();

4
net/ipv4/route.c
View file

@ -518,7 +518,7 @@ static void __build_flow_key(const struct net *net, struct flowi4 *fl4,
const struct inet_sock *inet = inet_sk(sk); const struct inet_sock *inet = inet_sk(sk);
oif = sk->sk_bound_dev_if; oif = sk->sk_bound_dev_if;
mark = sk->sk_mark; mark = READ_ONCE(sk->sk_mark);
tos = ip_sock_rt_tos(sk); tos = ip_sock_rt_tos(sk);
scope = ip_sock_rt_scope(sk); scope = ip_sock_rt_scope(sk);
prot = inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol; prot = inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol;
@ -552,7 +552,7 @@ static void build_sk_flow_key(struct flowi4 *fl4, const struct sock *sk)
inet_opt = rcu_dereference(inet->inet_opt); inet_opt = rcu_dereference(inet->inet_opt);
if (inet_opt && inet_opt->opt.srr) if (inet_opt && inet_opt->opt.srr)
daddr = inet_opt->opt.faddr; daddr = inet_opt->opt.faddr;
flowi4_init_output(fl4, sk->sk_bound_dev_if, sk->sk_mark, flowi4_init_output(fl4, sk->sk_bound_dev_if, READ_ONCE(sk->sk_mark),
ip_sock_rt_tos(sk) & IPTOS_RT_MASK, ip_sock_rt_tos(sk) & IPTOS_RT_MASK,
ip_sock_rt_scope(sk), ip_sock_rt_scope(sk),
inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol, inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,

2
net/ipv4/tcp_ipv4.c
View file

@ -931,7 +931,7 @@ static void tcp_v4_send_ack(const struct sock *sk,
ctl_sk = this_cpu_read(ipv4_tcp_sk); ctl_sk = this_cpu_read(ipv4_tcp_sk);
sock_net_set(ctl_sk, net); sock_net_set(ctl_sk, net);
ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ? ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ?
inet_twsk(sk)->tw_mark : sk->sk_mark; inet_twsk(sk)->tw_mark : READ_ONCE(sk->sk_mark);
ctl_sk->sk_priority = (sk->sk_state == TCP_TIME_WAIT) ? ctl_sk->sk_priority = (sk->sk_state == TCP_TIME_WAIT) ?
inet_twsk(sk)->tw_priority : sk->sk_priority; inet_twsk(sk)->tw_priority : sk->sk_priority;
transmit_time = tcp_transmit_time(sk); transmit_time = tcp_transmit_time(sk);

2
net/ipv6/ping.c
View file

@ -120,7 +120,7 @@ static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
ipcm6_init_sk(&ipc6, np); ipcm6_init_sk(&ipc6, np);
ipc6.sockc.tsflags = sk->sk_tsflags; ipc6.sockc.tsflags = sk->sk_tsflags;
ipc6.sockc.mark = sk->sk_mark; ipc6.sockc.mark = READ_ONCE(sk->sk_mark);
fl6.flowi6_oif = oif; fl6.flowi6_oif = oif;

4
net/ipv6/raw.c
View file

@ -774,12 +774,12 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
*/ */
memset(&fl6, 0, sizeof(fl6)); memset(&fl6, 0, sizeof(fl6));
fl6.flowi6_mark = sk->sk_mark; fl6.flowi6_mark = READ_ONCE(sk->sk_mark);
fl6.flowi6_uid = sk->sk_uid; fl6.flowi6_uid = sk->sk_uid;
ipcm6_init(&ipc6); ipcm6_init(&ipc6);
ipc6.sockc.tsflags = sk->sk_tsflags; ipc6.sockc.tsflags = sk->sk_tsflags;
ipc6.sockc.mark = sk->sk_mark; ipc6.sockc.mark = fl6.flowi6_mark;
if (sin6) { if (sin6) {
if (addr_len < SIN6_LEN_RFC2133) if (addr_len < SIN6_LEN_RFC2133)

7
net/ipv6/route.c
View file

@ -2951,7 +2951,8 @@ void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)
if (!oif && skb->dev) if (!oif && skb->dev)
oif = l3mdev_master_ifindex(skb->dev); oif = l3mdev_master_ifindex(skb->dev);
ip6_update_pmtu(skb, sock_net(sk), mtu, oif, sk->sk_mark, sk->sk_uid); ip6_update_pmtu(skb, sock_net(sk), mtu, oif, READ_ONCE(sk->sk_mark),
sk->sk_uid);
dst = __sk_dst_get(sk); dst = __sk_dst_get(sk);
if (!dst || !dst->obsolete || if (!dst || !dst->obsolete ||
@ -3172,8 +3173,8 @@ 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) void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk)
{ {
ip6_redirect(skb, sock_net(sk), sk->sk_bound_dev_if, sk->sk_mark, ip6_redirect(skb, sock_net(sk), sk->sk_bound_dev_if,
sk->sk_uid); READ_ONCE(sk->sk_mark), sk->sk_uid);
} }
EXPORT_SYMBOL_GPL(ip6_sk_redirect); EXPORT_SYMBOL_GPL(ip6_sk_redirect);

6
net/ipv6/tcp_ipv6.c
View file

@ -564,8 +564,8 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
opt = ireq->ipv6_opt; opt = ireq->ipv6_opt;
if (!opt) if (!opt)
opt = rcu_dereference(np->opt); opt = rcu_dereference(np->opt);
err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt, err = ip6_xmit(sk, skb, fl6, skb->mark ? : READ_ONCE(sk->sk_mark),
tclass, sk->sk_priority); opt, tclass, sk->sk_priority);
rcu_read_unlock(); rcu_read_unlock();
err = net_xmit_eval(err); err = net_xmit_eval(err);
} }
@ -939,7 +939,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32
if (sk->sk_state == TCP_TIME_WAIT) if (sk->sk_state == TCP_TIME_WAIT)
mark = inet_twsk(sk)->tw_mark; mark = inet_twsk(sk)->tw_mark;
else else
mark = sk->sk_mark; mark = READ_ONCE(sk->sk_mark);
skb_set_delivery_time(buff, tcp_transmit_time(sk), true); skb_set_delivery_time(buff, tcp_transmit_time(sk), true);
} }
if (txhash) { if (txhash) {

4
net/ipv6/udp.c
View file

@ -628,7 +628,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (type == NDISC_REDIRECT) { if (type == NDISC_REDIRECT) {
if (tunnel) { if (tunnel) {
ip6_redirect(skb, sock_net(sk), inet6_iif(skb), ip6_redirect(skb, sock_net(sk), inet6_iif(skb),
sk->sk_mark, sk->sk_uid); READ_ONCE(sk->sk_mark), sk->sk_uid);
} else { } else {
ip6_sk_redirect(skb, sk); ip6_sk_redirect(skb, sk);
} }
@ -1360,7 +1360,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
ipcm6_init(&ipc6); ipcm6_init(&ipc6);
ipc6.gso_size = READ_ONCE(up->gso_size); ipc6.gso_size = READ_ONCE(up->gso_size);
ipc6.sockc.tsflags = sk->sk_tsflags; ipc6.sockc.tsflags = sk->sk_tsflags;
ipc6.sockc.mark = sk->sk_mark; ipc6.sockc.mark = READ_ONCE(sk->sk_mark);
/* destination address check */ /* destination address check */
if (sin6) { if (sin6) {

2
net/l2tp/l2tp_ip6.c
View file

@ -519,7 +519,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
/* Get and verify the address */ /* Get and verify the address */
memset(&fl6, 0, sizeof(fl6)); memset(&fl6, 0, sizeof(fl6));
fl6.flowi6_mark = sk->sk_mark; fl6.flowi6_mark = READ_ONCE(sk->sk_mark);
fl6.flowi6_uid = sk->sk_uid; fl6.flowi6_uid = sk->sk_uid;
ipcm6_init(&ipc6); ipcm6_init(&ipc6);

2
net/mptcp/sockopt.c
View file

@ -103,7 +103,7 @@ static void mptcp_sol_socket_sync_intval(struct mptcp_sock *msk, int optname, in
break; break;
case SO_MARK: case SO_MARK:
if (READ_ONCE(ssk->sk_mark) != sk->sk_mark) { if (READ_ONCE(ssk->sk_mark) != sk->sk_mark) {
ssk->sk_mark = sk->sk_mark; WRITE_ONCE(ssk->sk_mark, sk->sk_mark);
sk_dst_reset(ssk); sk_dst_reset(ssk);
} }
break; break;

2
net/netfilter/nft_socket.c
View file

@ -107,7 +107,7 @@ static void nft_socket_eval(const struct nft_expr *expr,
break; break;
case NFT_SOCKET_MARK: case NFT_SOCKET_MARK:
if (sk_fullsock(sk)) { if (sk_fullsock(sk)) {
*dest = sk->sk_mark; *dest = READ_ONCE(sk->sk_mark);
} else { } else {
regs->verdict.code = NFT_BREAK; regs->verdict.code = NFT_BREAK;
return; return;

4
net/netfilter/xt_socket.c
View file

@ -77,7 +77,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par,
if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard && if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&
transparent && sk_fullsock(sk)) transparent && sk_fullsock(sk))
pskb->mark = sk->sk_mark; pskb->mark = READ_ONCE(sk->sk_mark);
if (sk != skb->sk) if (sk != skb->sk)
sock_gen_put(sk); sock_gen_put(sk);
@ -138,7 +138,7 @@ socket_mt6_v1_v2_v3(const struct sk_buff *skb, struct xt_action_param *par)
if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard && if (info->flags & XT_SOCKET_RESTORESKMARK && !wildcard &&
transparent && sk_fullsock(sk)) transparent && sk_fullsock(sk))
pskb->mark = sk->sk_mark; pskb->mark = READ_ONCE(sk->sk_mark);
if (sk != skb->sk) if (sk != skb->sk)
sock_gen_put(sk); sock_gen_put(sk);

6
net/packet/af_packet.c
View file

@ -2051,7 +2051,7 @@ retry:
skb->protocol = proto; skb->protocol = proto;
skb->dev = dev; skb->dev = dev;
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
skb->mark = sk->sk_mark; skb->mark = READ_ONCE(sk->sk_mark);
skb->tstamp = sockc.transmit_time; skb->tstamp = sockc.transmit_time;
skb_setup_tx_timestamp(skb, sockc.tsflags); skb_setup_tx_timestamp(skb, sockc.tsflags);
@ -2586,7 +2586,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
skb->protocol = proto; skb->protocol = proto;
skb->dev = dev; skb->dev = dev;
skb->priority = po->sk.sk_priority; skb->priority = po->sk.sk_priority;
skb->mark = po->sk.sk_mark; skb->mark = READ_ONCE(po->sk.sk_mark);
skb->tstamp = sockc->transmit_time; skb->tstamp = sockc->transmit_time;
skb_setup_tx_timestamp(skb, sockc->tsflags); skb_setup_tx_timestamp(skb, sockc->tsflags);
skb_zcopy_set_nouarg(skb, ph.raw); skb_zcopy_set_nouarg(skb, ph.raw);
@ -2988,7 +2988,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
goto out_unlock; goto out_unlock;
sockcm_init(&sockc, sk); sockcm_init(&sockc, sk);
sockc.mark = sk->sk_mark; sockc.mark = READ_ONCE(sk->sk_mark);
if (msg->msg_controllen) { if (msg->msg_controllen) {
err = sock_cmsg_send(sk, msg, &sockc); err = sock_cmsg_send(sk, msg, &sockc);
if (unlikely(err)) if (unlikely(err))

2
net/smc/af_smc.c
View file

@ -445,7 +445,7 @@ static void smc_copy_sock_settings(struct sock *nsk, struct sock *osk,
nsk->sk_rcvbuf = osk->sk_rcvbuf; nsk->sk_rcvbuf = osk->sk_rcvbuf;
nsk->sk_sndtimeo = osk->sk_sndtimeo; nsk->sk_sndtimeo = osk->sk_sndtimeo;
nsk->sk_rcvtimeo = osk->sk_rcvtimeo; nsk->sk_rcvtimeo = osk->sk_rcvtimeo;
nsk->sk_mark = osk->sk_mark; nsk->sk_mark = READ_ONCE(osk->sk_mark);
nsk->sk_priority = osk->sk_priority; nsk->sk_priority = osk->sk_priority;
nsk->sk_rcvlowat = osk->sk_rcvlowat; nsk->sk_rcvlowat = osk->sk_rcvlowat;
nsk->sk_bound_dev_if = osk->sk_bound_dev_if; nsk->sk_bound_dev_if = osk->sk_bound_dev_if;

2
net/xdp/xsk.c
View file

@ -505,7 +505,7 @@ static struct sk_buff *xsk_build_skb(struct xdp_sock *xs,
skb->dev = dev; skb->dev = dev;
skb->priority = xs->sk.sk_priority; skb->priority = xs->sk.sk_priority;
skb->mark = xs->sk.sk_mark; skb->mark = READ_ONCE(xs->sk.sk_mark);
skb_shinfo(skb)->destructor_arg = (void *)(long)desc->addr; skb_shinfo(skb)->destructor_arg = (void *)(long)desc->addr;
skb->destructor = xsk_destruct_skb; skb->destructor = xsk_destruct_skb;

2
net/xfrm/xfrm_policy.c
View file

@ -2250,7 +2250,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,
match = xfrm_selector_match(&pol->selector, fl, family); match = xfrm_selector_match(&pol->selector, fl, family);
if (match) { if (match) {
if ((sk->sk_mark & pol->mark.m) != pol->mark.v || if ((READ_ONCE(sk->sk_mark) & pol->mark.m) != pol->mark.v ||
pol->if_id != if_id) { pol->if_id != if_id) {
pol = NULL; pol = NULL;
goto out; goto out;