arm64: dts: freescale: imx8mm-phyboard-polis: Add TPM node

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

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 6f07209..57c8af1 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3590,8 +3590,11 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32
 static bool __tcp_oow_rate_limited(struct net *net, int mib_idx,
                                   u32 *last_oow_ack_time)
 {
-       if (*last_oow_ack_time) {
-               s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time);
+       /* Paired with the WRITE_ONCE() in this function. */
+       u32 val = READ_ONCE(*last_oow_ack_time);
+
+       if (val) {
+               s32 elapsed = (s32)(tcp_jiffies32 - val);
 
                if (0 <= elapsed &&
                    elapsed < READ_ONCE(net->ipv4.sysctl_tcp_invalid_ratelimit)) {
@@ -3600,7 +3603,10 @@ static bool __tcp_oow_rate_limited(struct net *net, int mib_idx,
                }
        }
 
-       *last_oow_ack_time = tcp_jiffies32;
+       /* Paired with the prior READ_ONCE() and with itself,
+        * as we might be lockless.
+        */
+       WRITE_ONCE(*last_oow_ack_time, tcp_jiffies32);
 
        return false;   /* not rate-limited: go ahead, send dupack now! */
 }