1 files changed, 6 insertions, 4 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index be11dc13aa70..1f04ec0e4a7a 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1454,7 +1454,6 @@ process:
                 struct sock *nsk;
 
                 sk = req->rsk_listener;
-                tcp_v6_fill_cb(skb, hdr, th);
                 if (tcp_v6_inbound_md5_hash(sk, skb)) {
                         sk_drops_add(sk, skb);
                         reqsk_put(req);
@@ -1467,8 +1466,12 @@ process:
                 sock_hold(sk);
                 refcounted = true;
                 nsk = NULL;
-                if (!tcp_filter(sk, skb))
+                if (!tcp_filter(sk, skb)) {
+                        th = (const struct tcphdr *)skb->data;
+                        hdr = ipv6_hdr(skb);
+                        tcp_v6_fill_cb(skb, hdr, th);
                         nsk = tcp_check_req(sk, skb, req, false);
+                }
                 if (!nsk) {
                         reqsk_put(req);
                         goto discard_and_relse;
@@ -1492,8 +1495,6 @@ process:
         if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_and_relse;
 
-        tcp_v6_fill_cb(skb, hdr, th);
-
         if (tcp_v6_inbound_md5_hash(sk, skb))
                 goto discard_and_relse;
 
@@ -1501,6 +1502,7 @@ process:
                 goto discard_and_relse;
         th = (const struct tcphdr *)skb->data;
         hdr = ipv6_hdr(skb);
+        tcp_v6_fill_cb(skb, hdr, th);
 
         skb->dev = NULL;