netfilter: nft_payload: access GRE payload via inner offset
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v4 1/6 netfilter: nft_payload: access GRE payload via inner offset
Parse GRE v0 packets to properly set up inner offset, this allow for matching on inner headers.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v4: - add default case to deal with unsupported version.
- use gre_full_hdr to get offset to seq field.
- only gre v0 support at this stage.
This patch is the only update wrt. v3 series.
net/netfilter/nft_payload.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
net/netfilter/nft_payload.c +29 -0
@@ -19,6 +19,7 @@/* For layer 4 checksum field offset. */ #include <linux/tcp.h> #include <linux/udp.h> +#include <net/gre.h> #include <linux/icmpv6.h> #include <linux/ip.h> #include <linux/ipv6.h>
@@ -100,6 +101,34 @@ 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 gre_full_hdr, seq); +break ; +default : +return -1 ; + } + + pkt->inneroff = thoff + offset; + } +break ;default :return -1 ; }
Signature · 1 line
2.30.2