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

Commit 7686a02c authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: fix type of sysctl variables in nf_conntrack_ipv6 



These variables should be unsigned.  This fixes sysctl handler for
nf_ct_frag6_{low,high}_thresh.

Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bdf87d9

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ extern unsigned long nf_ct_icmpv6_timeout; 


/* From nf_conntrack_frag6.c */

extern unsigned long nf_ct_frag6_timeout;

extern unsigned long nf_ct_frag6_low_thresh;

extern unsigned long nf_ct_frag6_high_thresh;

extern unsigned int nf_ct_frag6_low_thresh;

extern unsigned int nf_ct_frag6_high_thresh;



static struct ctl_table_header *nf_ct_ipv6_sysctl_header;
@@ -367,7 +367,7 @@ static ctl_table nf_ct_sysctl_table[] = { 
		.data		= &nf_ct_frag6_low_thresh,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.proc_handler	= &proc_dointvec,

	},

	{

		.ctl_name	= NET_NF_CONNTRACK_FRAG6_HIGH_THRESH,
@@ -375,7 +375,7 @@ static ctl_table nf_ct_sysctl_table[] = { 
		.data		= &nf_ct_frag6_high_thresh,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.proc_handler	= &proc_dointvec,

	},

        { .ctl_name = 0 }

};

net/ipv6/netfilter/nf_conntrack_reasm.c

+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ 
#define NF_CT_FRAG6_LOW_THRESH 196608  /* == 192*1024 */

#define NF_CT_FRAG6_TIMEOUT IPV6_FRAG_TIMEOUT



int nf_ct_frag6_high_thresh = 256*1024;

int nf_ct_frag6_low_thresh = 192*1024;

int nf_ct_frag6_timeout = IPV6_FRAG_TIMEOUT;

unsigned int nf_ct_frag6_high_thresh = 256*1024;

unsigned int nf_ct_frag6_low_thresh = 192*1024;

unsigned long nf_ct_frag6_timeout = IPV6_FRAG_TIMEOUT;



struct nf_ct_frag6_skb_cb

{