From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 17 Oct 2022 11:03:30 +0000 (+0200)
Subject: netfilter: nft_payload: access ipip payload for inner offset
X-Git-Tag: v6.2-rc1~99^2~350^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3927ce8850cacc1790cd4c5d02ca42e24df9fa6b;p=thirdparty%2Fkernel%2Flinux.git

netfilter: nft_payload: access ipip payload for inner offset

ipip is an special case, transport and inner header offset are set to
the same offset to use the upcoming inner expression for matching on
inner tunnel headers.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 03a1f271bf4fb..84b490d6cc759 100644
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -132,6 +132,9 @@ static int __nft_payload_inner_offset(struct nft_pktinfo *pkt)
 		pkt->inneroff = thoff + offset;
 		}
 		break;
+	case IPPROTO_IPIP:
+		pkt->inneroff = thoff;
+		break;
 	default:
 		return -1;
 	}