Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 724bab47 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: ipset: fix linking with CONFIG_IPV6=n 



Add a dummy ip_set_get_ip6_port function that unconditionally
returns false for CONFIG_IPV6=n and convert the real function
to ipv6_skip_exthdr() to avoid pulling in the ip6_tables module
when loading ipset.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 316ed388

include/linux/netfilter/ipset/ip_set_getport.h

+10 −0
Original line number Diff line number Diff line
@@ -3,8 +3,18 @@ 


extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src,

				__be16 *port, u8 *proto);



#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

extern bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src,

				__be16 *port, u8 *proto);

#else

static inline bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src,

				       __be16 *port, u8 *proto)

{

	return false;

}

#endif



extern bool ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src,

				__be16 *port);

net/netfilter/ipset/ip_set_getport.c

+9 −6
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/icmpv6.h>

#include <linux/netfilter_ipv6/ip6_tables.h>

#include <net/ip.h>

#include <net/ipv6.h>



#include <linux/netfilter/ipset/ip_set_getport.h>
@@ -93,21 +94,23 @@ ip_set_get_ip4_port(const struct sk_buff *skb, bool src, 
}

EXPORT_SYMBOL_GPL(ip_set_get_ip4_port);



#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

bool

ip_set_get_ip6_port(const struct sk_buff *skb, bool src,

		    __be16 *port, u8 *proto)

{

	unsigned int protooff = 0;

	int protocol;

	unsigned short fragoff;

	int protoff;

	u8 nexthdr;



	protocol = ipv6_find_hdr(skb, &protooff, -1, &fragoff);

	if (protocol <= 0 || fragoff)

	nexthdr = ipv6_hdr(skb)->nexthdr;

	protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr);

	if (protoff < 0)

		return false;



	return get_port(skb, protocol, protooff, src, port, proto);

	return get_port(skb, nexthdr, protoff, src, port, proto);

}

EXPORT_SYMBOL_GPL(ip_set_get_ip6_port);

#endif



bool

ip_set_get_ip_port(const struct sk_buff *skb, u8 pf, bool src, __be16 *port)