]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
netfilter: nf_conntrack: padding breaks conntrack hash on ARM
authorPhilip Craig <philipc@snapgear.com>
Tue, 29 Apr 2008 10:35:10 +0000 (03:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Apr 2008 10:35:10 +0000 (03:35 -0700)
commit443a70d50bdc212e1292778e264ce3d0a85b896f
tree6b00ca5759949a4c11f77b683d9f65cae82a68e3
parent0010e46577a27c1d915034637f6c2fa57a9a091c
netfilter: nf_conntrack: padding breaks conntrack hash on ARM

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: David S. Miller <davem@davemloft.net>
include/net/netfilter/nf_conntrack_tuple.h
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
net/netfilter/nf_conntrack_core.c