summaryrefslogtreecommitdiff
path: root/net/netrom/af_netrom.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2023-10-01 21:09:55 +0300
committerDavid S. Miller <davem@davemloft.net>2023-10-01 21:09:55 +0300
commit2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f (patch)
tree5a49235d004d92fa6330bbeacf24b5252cea032c /net/netrom/af_netrom.c
parent06bc3668cc2a6db2831b9086f0e3c6ebda599dba (diff)
parenteb44ad4e635132754bfbcb18103f1dcb7058aedd (diff)
downloadlinux-2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f.tar.xz
Merge branch 'socket-option-lockless'
Eric Dumazet says: ==================== net: more data-races fixes and lockless socket options This is yet another round of data-races fixes, and lockless socket options. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r--net/netrom/af_netrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 96e91ab71573..0eed00184adf 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -487,7 +487,7 @@ static struct sock *nr_make_new(struct sock *osk)
sock_init_data(NULL, sk);
sk->sk_type = osk->sk_type;
- sk->sk_priority = osk->sk_priority;
+ sk->sk_priority = READ_ONCE(osk->sk_priority);
sk->sk_protocol = osk->sk_protocol;
sk->sk_rcvbuf = osk->sk_rcvbuf;
sk->sk_sndbuf = osk->sk_sndbuf;