[PATCH nf-next,v3 1/6] netfilter: nft_payload: access GRE payload via inner offset

[Pablo Neira Ayuso <pablo@netfilter.org>]

Parse GRE packets to properly set up inner offset, this allow for
matching on inner headers. This includes support for GRE v0 and v1.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
v3: handle GREv0 and GREv1.

 net/netfilter/nft_payload.c | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 99d971fc54ad..448e32750fa0 100644
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -19,6 +19,8 @@
 /* For layer 4 checksum field offset. */
 #include <linux/tcp.h>
 #include <linux/udp.h>
+#include <net/gre.h>
+#include <net/pptp.h>
 #include <linux/icmpv6.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
@@ -100,6 +102,42 @@ static int __nft_payload_inner_offset(struct nft_pktinfo *pkt)
 		pkt->inneroff = thoff + __tcp_hdrlen(th);
 		}
 		break;
+	case IPPROTO_GRE: {
+		u32 offset = sizeof(struct gre_base_hdr), version;
+		struct gre_base_hdr *gre, _gre;
+
+		gre = skb_header_pointer(pkt->skb, thoff, sizeof(_gre), &_gre);
+		if (!gre)
+			return -1;
+
+		version = gre->flags & GRE_VERSION;
+		switch (version) {
+		case GRE_VERSION_0:
+			if (gre->flags & GRE_CSUM) {
+				offset += sizeof_field(struct gre_full_hdr, csum) +
+					  sizeof_field(struct gre_full_hdr, reserved1);
+			}
+			if (gre->flags & GRE_KEY)
+				offset += sizeof_field(struct gre_full_hdr, key);
+
+			if (gre->flags & GRE_SEQ)
+				offset += sizeof_field(struct pptp_gre_header, seq);
+			break;
+		case GRE_VERSION_1:
+			offset += sizeof_field(struct pptp_gre_header, payload_len) +
+				  sizeof_field(struct pptp_gre_header, call_id);
+
+			if (gre->flags & GRE_SEQ)
+				offset += sizeof_field(struct pptp_gre_header, seq);
+
+			if (gre->flags & GRE_ACK)
+				offset += sizeof_field(struct pptp_gre_header, ack);
+			break;
+		}
+
+		pkt->inneroff = thoff + offset;
+		}
+		break;
 	default:
 		return -1;
 	}
-- 
2.30.2