From: Roel Kluin <12o3l@tiscali.nl> Date: Thu, 20 Mar 2008 22:06:23 +0000 (-0700) Subject: [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup() X-Git-Tag: v2.6.25-rc7~54^2~11 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6aebb9b280e5662ece41cf570e25e61795443985;p=~shefty%2Frdma-dev.git [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup() logical-bitwise & confusion Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller --- diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 62137879e6a..898f1922b5b 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -842,7 +842,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct, set_h225_addr = rcu_dereference(set_h225_addr_hook); if ((setup->options & eSetup_UUIE_destCallSignalAddress) && - (set_h225_addr) && ct->status && IPS_NAT_MASK && + (set_h225_addr) && ct->status & IPS_NAT_MASK && get_h225_addr(ct, *data, &setup->destCallSignalAddress, &addr, &port) && memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) {