1 files changed, 21 insertions, 11 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 5d2c2afffe7b..22e28a44e3c8 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -257,6 +257,7 @@ static struct sock *udp6_lib_lookup2(struct net *net,
         struct sock *sk, *result;
         struct hlist_nulls_node *node;
         int score, badness, matches = 0, reuseport = 0;
+        bool select_ok = true;
         u32 hash = 0;
 
 begin:
@@ -270,14 +271,18 @@ begin:
                         badness = score;
                         reuseport = sk->sk_reuseport;
                         if (reuseport) {
-                                struct sock *sk2;
                                 hash = udp6_ehashfn(net, daddr, hnum,
                                                     saddr, sport);
-                                sk2 = reuseport_select_sock(sk, hash, skb,
-                                                            sizeof(struct udphdr));
-                                if (sk2) {
-                                        result = sk2;
-                                        goto found;
+                                if (select_ok) {
+                                        struct sock *sk2;
+
+                                        sk2 = reuseport_select_sock(sk, hash, skb,
+                                                        sizeof(struct udphdr));
+                                        if (sk2) {
+                                                result = sk2;
+                                                select_ok = false;
+                                                goto found;
+                                        }
                                 }
                                 matches = 1;
                         }
@@ -321,6 +326,7 @@ struct sock *__udp6_lib_lookup(struct net *net,
         unsigned int hash2, slot2, slot = udp_hashfn(net, hnum, udptable->mask);
         struct udp_hslot *hslot2, *hslot = &udptable->hash[slot];
         int score, badness, matches = 0, reuseport = 0;
+        bool select_ok = true;
         u32 hash = 0;
 
         rcu_read_lock();
@@ -358,14 +364,18 @@ begin:
                         badness = score;
                         reuseport = sk->sk_reuseport;
                         if (reuseport) {
-                                struct sock *sk2;
                                 hash = udp6_ehashfn(net, daddr, hnum,
                                                     saddr, sport);
-                                sk2 = reuseport_select_sock(sk, hash, skb,
+                                if (select_ok) {
+                                        struct sock *sk2;
+
+                                        sk2 = reuseport_select_sock(sk, hash, skb,
                                                         sizeof(struct udphdr));
-                                if (sk2) {
-                                        result = sk2;
-                                        goto found;
+                                        if (sk2) {
+                                                result = sk2;
+                                                select_ok = false;
+                                                goto found;
+                                        }
                                 }
                                 matches = 1;
                         }