diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-09-21 23:28:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-01 21:09:54 +0300 |
| commit | 10bbf1652c1cca9819e98d56f3432c56d7a2d229 (patch) | |
| tree | ab9494c905436ea6f2b9fa1bb979addd2d58da71 /net/can | |
| parent | 06bc3668cc2a6db2831b9086f0e3c6ebda599dba (diff) | |
| download | linux-10bbf1652c1cca9819e98d56f3432c56d7a2d229.tar.xz | |
net: implement lockless SO_PRIORITY
This is a followup of 8bf43be799d4 ("net: annotate data-races
around sk->sk_priority").
sk->sk_priority can be read and written without holding the socket lock.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/j1939/socket.c | 2 | ||||
| -rw-r--r-- | net/can/raw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index b28c976f52a0..14c431663233 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -884,7 +884,7 @@ static struct sk_buff *j1939_sk_alloc_skb(struct net_device *ndev, skcb = j1939_skb_to_cb(skb); memset(skcb, 0, sizeof(*skcb)); skcb->addr = jsk->addr; - skcb->priority = j1939_prio(sk->sk_priority); + skcb->priority = j1939_prio(READ_ONCE(sk->sk_priority)); if (msg->msg_name) { struct sockaddr_can *addr = msg->msg_name; diff --git a/net/can/raw.c b/net/can/raw.c index d50c3f3d892f..73468d2ebd51 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -881,7 +881,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) } skb->dev = dev; - skb->priority = sk->sk_priority; + skb->priority = READ_ONCE(sk->sk_priority); skb->mark = READ_ONCE(sk->sk_mark); skb->tstamp = sockc.transmit_time; |