]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
nf_conntrack: padding breaks conntrack hash on ARM
authorPhilip Craig <philipc@snapgear.com>
Tue, 13 May 2008 11:39:13 +0000 (13:39 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 15 May 2008 14:50:03 +0000 (07:50 -0700)
commitcc26d4771032bd678e38b89c7ae065d003ce23e1
tree9feecea8e01609627086ea6dd8238c3f20bb5eb2
parentc5bf357f053bef23cd44ef700f8eceba71ce7328
nf_conntrack: padding breaks conntrack hash on ARM

[NETFILTER]: nf_conntrack: padding breaks conntrack hash on ARM

Upstream commit 443a70d50:

commit 0794935e "[NETFILTER]: nf_conntrack: optimize hash_conntrack()"
results in ARM platforms hashing uninitialised padding.  This padding
doesn't exist on other architectures.

Fix this by replacing NF_CT_TUPLE_U_BLANK() with memset() to ensure
everything is initialised.  There were only 4 bytes that
NF_CT_TUPLE_U_BLANK() wasn't clearing anyway (or 12 bytes on ARM).

Signed-off-by: Philip Craig <philipc@snapgear.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/net/netfilter/nf_conntrack_tuple.h
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
net/netfilter/nf_conntrack_core.c