1 files changed, 4 insertions, 9 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 62c19fdd102d..f140048334ce 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1600,20 +1600,15 @@ static void flush_stack(struct sock **stack, unsigned int count,
 }
 
 /* For TCP sockets, sk_rx_dst is protected by socket lock
- * For UDP, we use sk_dst_lock to guard against concurrent changes.
+ * For UDP, we use xchg() to guard against concurrent changes.
  */
 static void udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst)
 {
         struct dst_entry *old;
 
-        spin_lock(&sk->sk_dst_lock);
-        old = sk->sk_rx_dst;
-        if (likely(old != dst)) {
-                dst_hold(dst);
-                sk->sk_rx_dst = dst;
-                dst_release(old);
-        }
-        spin_unlock(&sk->sk_dst_lock);
+        dst_hold(dst);
+        old = xchg(&sk->sk_rx_dst, dst);
+        dst_release(old);
 }
 
 /*