Merge tag 'kbuild-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / net / dccp / ipv4.c

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index b780827..3ab6841 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -177,7 +177,7 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk,
         * for the case, if this connection will not able to recover.
         */
        if (mtu < dst_mtu(dst) && ip_dont_fragment(sk, dst))
-               sk->sk_err_soft = EMSGSIZE;
+               WRITE_ONCE(sk->sk_err_soft, EMSGSIZE);
 
        mtu = dst_mtu(dst);
 
@@ -339,8 +339,9 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)
                        sk_error_report(sk);
 
                        dccp_done(sk);
-               } else
-                       sk->sk_err_soft = err;
+               } else {
+                       WRITE_ONCE(sk->sk_err_soft, err);
+               }
                goto out;
        }
 
@@ -364,8 +365,9 @@ static int dccp_v4_err(struct sk_buff *skb, u32 info)
        if (!sock_owned_by_user(sk) && inet->recverr) {
                sk->sk_err = err;
                sk_error_report(sk);
-       } else /* Only an error on timeout */
-               sk->sk_err_soft = err;
+       } else { /* Only an error on timeout */
+               WRITE_ONCE(sk->sk_err_soft, err);
+       }
 out:
        bh_unlock_sock(sk);
        sock_put(sk);