netfilter: ipset: make ip_set_get_ip*_port to use skb_network_offset (3e4e8d12) · Commits · 戴 / test

All the ipset functions respect skb->network_header value, except for ip_set_get_ip4_port() & ip_set_get_ip6_port(). The functions should use skb_network_offset() to get the transport header offset. Signed-off-by:

Alexander Drozdov <al.drozdov@gmail.com> Signed-off-by:

Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by:

Pablo Neira Ayuso <pablo@netfilter.org>

net/netfilter/ipset/ip_set_getport.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ ip_set_get_ip4_port(const struct sk_buff *skb, bool src,
		__be16 port, u8 proto)
		{
		const struct iphdr *iph = ip_hdr(skb);
		unsigned int protooff = ip_hdrlen(skb);
		unsigned int protooff = skb_network_offset(skb) + ip_hdrlen(skb);
		int protocol = iph->protocol;

		/* See comments at tcp_match in ip_tables.c */
		@@ -135,7 +135,9 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
		__be16 frag_off = 0;

		nexthdr = ipv6_hdr(skb)->nexthdr;
		protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr,
		protoff = ipv6_skip_exthdr(skb,
		skb_network_offset(skb) +
		sizeof(struct ipv6hdr), &nexthdr,
		&frag_off);
		if (protoff < 0 \|\| (frag_off & htons(~0x7)) != 0)
		return false;

Admin message