netfilter fix (5/7): conntrack 64bit bigendian fixes
Subsystems (2)
PATCH 1/1 netfilter fix (5/7): conntrack 64bit bigendian fixes
Hi Dave!
Here goes the fifth...
Author: Jakub Bogusz <[email protected]>
This patch fixes bugs related to machine endianess (harmless on little-endians, but causing that some of conntrack modules don't work on big-endian machines).
net/ipv4/netfilter/ip_conntrack_core.c +4 -4
@@ -174,8 +174,8 @@static void destroy_expect (struct ip_conntrack_expect *exp) { -DEBUGP ("destroy_expect(%p) use=%d\n" , exp,atomic_read (exp->use)); -IP_NF_ASSERT (atomic_read (exp->use)); +DEBUGP ("destroy_expect(%p) use=%d\n" , exp,atomic_read (&exp->use)); +IP_NF_ASSERT (atomic_read (&exp->use));IP_NF_ASSERT (!timer_pending (&exp->timeout));kfree (exp);
@@ -1309,8 +1309,8 @@ getorigdst(struct sock *sk, int optval, void *user, int *len) { struct ip_conntrack_tuple_hash *h; -struct ip_conntrack_tuple tuple = { { sk->rcv_saddr, { sk->sport } }, - { sk->daddr, { sk->dport }, +struct ip_conntrack_tuple tuple = { { sk->rcv_saddr, { .tcp = { sk->sport } } }, + { sk->daddr, { .tcp = { sk->dport } },IPPROTO_TCP } };/* We only do TCP at the moment: is there a better way? */
net/ipv4/netfilter/ip_conntrack_ftp.c +2 -2
@@ -366,11 +366,11 @@ { 0 } }, {htonl ((array[0 ] <<24 ) | (array[1 ] <<16 ) | (array[2 ] <<8 ) | array[3 ]), - { htons(array[4] << 8 | array[5]) }, + { .tcp = { htons(array[4] << 8 | array[5]) } }, IPPROTO_TCP }}); exp->mask = ((struct ip_conntrack_tuple ) { {0xFFFFFFFF , {0 } }, - {0xFFFFFFFF , {0xFFFF },0xFFFF }}); + {0xFFFFFFFF , { .tcp = {0xFFFF } },0xFFFF }}); exp->expectfn =NULL ;
net/ipv4/netfilter/ip_conntrack_irc.c +2 -2
@@ -209,11 +209,11 @@ exp->tuple = ((struct ip_conntrack_tuple ) { {0 , {0 } }, - {htonl (dcc_ip), {htons (dcc_port) }, + {htonl (dcc_ip), { .tcp = {htons (dcc_port) } },IPPROTO_TCP }}); exp->mask = ((struct ip_conntrack_tuple ) { {0 , {0 } }, - {0xFFFFFFFF , {0xFFFF },0xFFFF }}); + {0xFFFFFFFF , { .tcp = {0xFFFF } },0xFFFF }}); exp->expectfn =NULL ;
Please apply, thanks.
Signature · 5 lines
- Harald Welte <[email protected]> http://www.netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie