From: Kuniyuki Iwashima <kuniyu@amazon.com>
Date: Wed, 14 Jun 2023 23:01:06 +0000 (-0700)
Subject: ipv6: exthdrs: Reload hdr only when needed in ipv6_srh_rcv().
X-Git-Tag: v6.5-rc1~163^2~66^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b83d50f43165e8c21d580f40c57d8f6fe85adb59;p=thirdparty%2Flinux.git

ipv6: exthdrs: Reload hdr only when needed in ipv6_srh_rcv().

We need not reload hdr in ipv6_srh_rcv() unless we call
pskb_expand_head().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index e62e26ac99ef1..dd23531387e3f 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -440,9 +440,9 @@ looped_back:
 			kfree_skb(skb);
 			return -1;
 		}
-	}
 
-	hdr = (struct ipv6_sr_hdr *)skb_transport_header(skb);
+		hdr = (struct ipv6_sr_hdr *)skb_transport_header(skb);
+	}
 
 	hdr->segments_left--;
 	addr = hdr->segments + hdr->segments_left;