From 49e76fd9f03d1e0e5e0cfe522fc23e08400fb5d2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 27 Feb 2008 12:20:41 -0800 Subject: [PATCH] --- yaml --- r: 86471 b: refs/heads/master c: 6556874dc3770aefae89907b3cf9be8e23d66137 h: refs/heads/master i: 86469: 37050ad54159a46be99bd20876f4bd9f8a52229e 86467: 0c557dcf7a2957d43cd9761078caaffba274dfb3 86463: af32b9bd9cbe1ca38e311133f055f37a56ad9d5b v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_conntrack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c956c5a69b1b..02812a9034e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d61f89e9417e68caf9ca801606694c1c960ad179 +refs/heads/master: 6556874dc3770aefae89907b3cf9be8e23d66137 diff --git a/trunk/net/netfilter/xt_conntrack.c b/trunk/net/netfilter/xt_conntrack.c index dd192ac74b4a..0c50b2894055 100644 --- a/trunk/net/netfilter/xt_conntrack.c +++ b/trunk/net/netfilter/xt_conntrack.c @@ -122,7 +122,7 @@ conntrack_addrcmp(const union nf_inet_addr *kaddr, const union nf_inet_addr *umask, unsigned int l3proto) { if (l3proto == AF_INET) - return (kaddr->ip & umask->ip) == uaddr->ip; + return ((kaddr->ip ^ uaddr->ip) & umask->ip) == 0; else if (l3proto == AF_INET6) return ipv6_masked_addr_cmp(&kaddr->in6, &umask->in6, &uaddr->in6) == 0;