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

Commit e478075c authored by Hagen Paul Pfeifer's avatar Hagen Paul Pfeifer Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: table max size should hold at least table size 



Table size is defined as unsigned, wheres the table maximum size is
defined as a signed integer. The calculation of max is 8 or 4,
multiplied the table size. Therefore the max value is aligned to
unsigned.

Signed-off-by: default avatarHagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 78454473

include/net/netfilter/nf_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb) 


extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);

extern unsigned int nf_conntrack_htable_size;

extern int nf_conntrack_max;

extern unsigned int nf_conntrack_max;



#define NF_CT_STAT_INC(net, count)	\

	(per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++)

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_lock); 
unsigned int nf_conntrack_htable_size __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_htable_size);



int nf_conntrack_max __read_mostly;

unsigned int nf_conntrack_max __read_mostly;

EXPORT_SYMBOL_GPL(nf_conntrack_max);



struct nf_conn nf_conntrack_untracked __read_mostly;