From 5ee03e6df41727652e0dc6ffaef8411b8840d812 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 20 Aug 2018 15:30:03 +0200 Subject: xtables: Use meta l4proto for -p match Use of payload expression to match against IPv6 nexthdr field does not work if extension headers are present. A simple example for that is matching for fragmented icmpv6 traffic. Instead, generate a 'meta l4proto' expression which works even if extension headers are present. For consistency, apply the same change to iptables-nft as well. No adjustment to reverse path required as the needed bits were added by commit 6ea7579e6fe24 ("nft: decode meta l4proto") already. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- iptables/nft-ipv6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'iptables/nft-ipv6.c') diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index dd23557c..48a7cefe 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -44,8 +44,7 @@ static int nft_ipv6_add(struct nftnl_rule *r, void *data) if (cs->fw6.ipv6.proto != 0) { op = nft_invflags2cmp(cs->fw6.ipv6.invflags, XT_INV_PROTO); - add_proto(r, offsetof(struct ip6_hdr, ip6_nxt), 1, - cs->fw6.ipv6.proto, op); + add_l4proto(r, cs->fw6.ipv6.proto, op); } if (!IN6_IS_ADDR_UNSPECIFIED(&cs->fw6.ipv6.src)) { -- cgit v1.2.3