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

Commit 71320afc authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

netfilter 06/09: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian 



An old bug crept back into the ICMP/ICMPv6 conntrack protocols: the timeout
values are defined as unsigned longs, the sysctl's maxsize is set to
sizeof(unsigned int). Use unsigned int for the timeout values as in the
other conntrack protocols.

Reported-by: default avatarJean-Mickael Guerin <jean-mickael.guerin@6wind.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d61ba9fd

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <net/netfilter/nf_conntrack_core.h>

#include <net/netfilter/nf_log.h>



static unsigned long nf_ct_icmp_timeout __read_mostly = 30*HZ;

static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ;



static bool icmp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,

			      struct nf_conntrack_tuple *tuple)

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h>

#include <net/netfilter/nf_log.h>



static unsigned long nf_ct_icmpv6_timeout __read_mostly = 30*HZ;

static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ;



static bool icmpv6_pkt_to_tuple(const struct sk_buff *skb,

				unsigned int dataoff,