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

Commit c7066f70 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: fix Kconfig dependencies 



Fix dependencies of netfilter realm match: it depends on NET_CLS_ROUTE,
which itself depends on NET_SCHED; this dependency is missing from netfilter.

Since matching on realms is also useful without having NET_SCHED enabled and
the option really only controls whether the tclassid member is included in
route and dst entries, rename the config option to IP_ROUTE_CLASSID and move
it outside of traffic scheduling context to get rid of the NET_SCHED dependeny.

Reported-by: default avatarVladis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent ae90bdea

include/net/dst.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct dst_entry { 


	u32			metrics[RTAX_MAX];



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	__u32			tclassid;

#else

	__u32			__pad2;

include/net/ip_fib.h

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct fib_nh { 
	int			nh_weight;

	int			nh_power;

#endif

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	__u32			nh_tclassid;

#endif

	int			nh_oif;
@@ -201,7 +201,7 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp, 
extern int __net_init fib4_rules_init(struct net *net);

extern void __net_exit fib4_rules_exit(struct net *net);



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

extern u32 fib_rules_tclass(struct fib_result *res);

#endif
@@ -235,7 +235,7 @@ extern struct fib_table *fib_hash_table(u32 id); 


static inline void fib_combine_itag(u32 *itag, struct fib_result *res)

{

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

#ifdef CONFIG_IP_MULTIPLE_TABLES

	u32 rtag;

#endif

net/ipv4/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ config IP_ROUTE_VERBOSE 
	  handled by the klogd daemon which is responsible for kernel messages

	  ("man klogd").



config IP_ROUTE_CLASSID

	bool



config IP_PNP

	bool "IP: kernel level autoconfiguration"

	help
@@ -655,4 +658,3 @@ config TCP_MD5SIG 
	  on the Internet.



	  If unsure, say N.

net/ipv4/fib_rules.c

+5 −5
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ struct fib4_rule { 
	__be32			srcmask;

	__be32			dst;

	__be32			dstmask;

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	u32			tclassid;

#endif

};



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

u32 fib_rules_tclass(struct fib_result *res)

{

	return res->r ? ((struct fib4_rule *) res->r)->tclassid : 0;
@@ -165,7 +165,7 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, 
	if (frh->dst_len)

		rule4->dst = nla_get_be32(tb[FRA_DST]);



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	if (tb[FRA_FLOW])

		rule4->tclassid = nla_get_u32(tb[FRA_FLOW]);

#endif
@@ -195,7 +195,7 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, 
	if (frh->tos && (rule4->tos != frh->tos))

		return 0;



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	if (tb[FRA_FLOW] && (rule4->tclassid != nla_get_u32(tb[FRA_FLOW])))

		return 0;

#endif
@@ -224,7 +224,7 @@ static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb, 
	if (rule4->src_len)

		NLA_PUT_BE32(skb, FRA_SRC, rule4->src);



#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

	if (rule4->tclassid)

		NLA_PUT_U32(skb, FRA_FLOW, rule4->tclassid);

#endif

net/ipv4/fib_semantics.c

+7 −7
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static inline int nh_comp(const struct fib_info *fi, const struct fib_info *ofi) 
#ifdef CONFIG_IP_ROUTE_MULTIPATH

		    nh->nh_weight != onh->nh_weight ||

#endif

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

		    nh->nh_tclassid != onh->nh_tclassid ||

#endif

		    ((nh->nh_flags ^ onh->nh_flags) & ~RTNH_F_DEAD))
@@ -422,7 +422,7 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh, 


			nla = nla_find(attrs, attrlen, RTA_GATEWAY);

			nexthop_nh->nh_gw = nla ? nla_get_be32(nla) : 0;

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

			nla = nla_find(attrs, attrlen, RTA_FLOW);

			nexthop_nh->nh_tclassid = nla ? nla_get_u32(nla) : 0;

#endif
@@ -476,7 +476,7 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi) 
			nla = nla_find(attrs, attrlen, RTA_GATEWAY);

			if (nla && nla_get_be32(nla) != nh->nh_gw)

				return 1;

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

			nla = nla_find(attrs, attrlen, RTA_FLOW);

			if (nla && nla_get_u32(nla) != nh->nh_tclassid)

				return 1;
@@ -783,7 +783,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
			goto err_inval;

		if (cfg->fc_gw && fi->fib_nh->nh_gw != cfg->fc_gw)

			goto err_inval;

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

		if (cfg->fc_flow && fi->fib_nh->nh_tclassid != cfg->fc_flow)

			goto err_inval;

#endif
@@ -796,7 +796,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
		nh->nh_oif = cfg->fc_oif;

		nh->nh_gw = cfg->fc_gw;

		nh->nh_flags = cfg->fc_flags;

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

		nh->nh_tclassid = cfg->fc_flow;

#endif

#ifdef CONFIG_IP_ROUTE_MULTIPATH
@@ -1006,7 +1006,7 @@ int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, 


		if (fi->fib_nh->nh_oif)

			NLA_PUT_U32(skb, RTA_OIF, fi->fib_nh->nh_oif);

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

		if (fi->fib_nh[0].nh_tclassid)

			NLA_PUT_U32(skb, RTA_FLOW, fi->fib_nh[0].nh_tclassid);

#endif
@@ -1031,7 +1031,7 @@ int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, 


			if (nh->nh_gw)

				NLA_PUT_BE32(skb, RTA_GATEWAY, nh->nh_gw);

#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_IP_ROUTE_CLASSID

			if (nh->nh_tclassid)

				NLA_PUT_U32(skb, RTA_FLOW, nh->nh_tclassid);

#endif