Commit 3e5e524f authored by Florian Westphal's avatar Florian Westphal Committed by Patrick McHardy
Browse files

netfilter: CONFIG_COMPAT: allow delta to exceed 32767 



with 32 bit userland and 64 bit kernels, it is unlikely but possible
that insertion of new rules fails even tough there are only about 2000
iptables rules.

This happens because the compat delta is using a short int.
Easily reproducible via "iptables -m limit" ; after about 2050
rules inserting new ones fails with -ELOOP.

Note that compat_delta included 2 bytes of padding on x86_64, so
structure size remains the same.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent fc0e3df4

include/linux/netfilter/x_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ extern void xt_compat_unlock(u_int8_t af); 


extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, short delta);

extern void xt_compat_flush_offsets(u_int8_t af);

extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset);

extern int xt_compat_calc_jump(u_int8_t af, unsigned int offset);



extern int xt_compat_match_offset(const struct xt_match *match);

extern int xt_compat_match_from_user(struct xt_entry_match *m,

net/netfilter/x_tables.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ MODULE_DESCRIPTION("{ip,ip6,arp,eb}_tables backend module"); 
struct compat_delta {

	struct compat_delta *next;

	unsigned int offset;

	short delta;

	int delta;

};



struct xt_af {
@@ -439,10 +439,10 @@ void xt_compat_flush_offsets(u_int8_t af) 
}

EXPORT_SYMBOL_GPL(xt_compat_flush_offsets);



short xt_compat_calc_jump(u_int8_t af, unsigned int offset)

int xt_compat_calc_jump(u_int8_t af, unsigned int offset)

{

	struct compat_delta *tmp;

	short delta;

	int delta;



	for (tmp = xt[af].compat_offsets, delta = 0; tmp; tmp = tmp->next)

		if (tmp->offset < offset)

CRA Git | Maintained and supported by SUSTech CRA and CCSE