]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
authorRoel Kluin <12o3l@tiscali.nl>
Thu, 20 Mar 2008 22:06:23 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Mar 2008 22:06:23 +0000 (15:06 -0700)
logical-bitwise & confusion

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_h323_main.c

index 62137879e6aa66e5b9668fac44996f458c46e253..898f1922b5b8ee3f5f4d59ddeced671e0de15872 100644 (file)
@@ -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))) {