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

Commit a5e78820 authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Patrick McHardy
Browse files

netfilter: x_tables: added hook number into match extension parameter structure. 



Signed-off-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e34d5c1a

include/linux/netfilter/x_tables.h

+4 −2
Original line number Diff line number Diff line
@@ -184,9 +184,10 @@ struct xt_counters_info 
 * @matchinfo:	per-match data

 * @fragoff:	packet is a fragment, this is the data offset

 * @thoff:	position of transport header relative to skb->data

 * @hotdrop:	drop packet if we had inspection problems

 * @hook:	hook number given packet came from

 * @family:	Actual NFPROTO_* through which the function is invoked

 * 		(helpful when match->family == NFPROTO_UNSPEC)

 * @hotdrop:	drop packet if we had inspection problems

 */

struct xt_match_param {

	const struct net_device *in, *out;
@@ -194,8 +195,9 @@ struct xt_match_param { 
	const void *matchinfo;

	int fragoff;

	unsigned int thoff;

	bool *hotdrop;

	unsigned int hooknum;

	u_int8_t family;

	bool *hotdrop;

};



/**

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ unsigned int ebt_do_table (unsigned int hook, struct sk_buff *skb, 
	mtpar.in      = tgpar.in  = in;

	mtpar.out     = tgpar.out = out;

	mtpar.hotdrop = &hotdrop;

	tgpar.hooknum = hook;

	mtpar.hooknum = tgpar.hooknum = hook;



	read_lock_bh(&table->lock);

	private = table->private;

net/ipv4/netfilter/ip_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ ipt_do_table(struct sk_buff *skb, 
	mtpar.in      = tgpar.in  = in;

	mtpar.out     = tgpar.out = out;

	mtpar.family  = tgpar.family = NFPROTO_IPV4;

	tgpar.hooknum = hook;

	mtpar.hooknum = tgpar.hooknum = hook;



	IP_NF_ASSERT(table->valid_hooks & (1 << hook));

	xt_info_rdlock_bh();

net/ipv6/netfilter/ip6_tables.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ ip6t_do_table(struct sk_buff *skb, 
	mtpar.in      = tgpar.in  = in;

	mtpar.out     = tgpar.out = out;

	mtpar.family  = tgpar.family = NFPROTO_IPV6;

	tgpar.hooknum = hook;

	mtpar.hooknum = tgpar.hooknum = hook;



	IP_NF_ASSERT(table->valid_hooks & (1 << hook));