summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuís Fernando Cornachioni Estrozi <lestrozi@uolinc.com>2013-11-06 21:39:32 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2013-11-19 15:33:29 +0100
commitacab78b99633f12aa2b697474562e19c5718a1ca (patch)
treecdc121d5fe9c2c6cc6b81a7e30ad7ed39c09cc1c /net
parent0c3c6c00c69649f4749642b3e5d82125fde1600c (diff)
downloadlinux-stable-acab78b99633f12aa2b697474562e19c5718a1ca.tar.gz
linux-stable-acab78b99633f12aa2b697474562e19c5718a1ca.tar.bz2
linux-stable-acab78b99633f12aa2b697474562e19c5718a1ca.zip
netfilter: ebt_ip6: fix source and destination matching
This bug was introduced on commit 0898f99a2. This just recovers two checks that existed before as suggested by Bart De Schuymer. Signed-off-by: Luís Fernando Cornachioni Estrozi <lestrozi@uolinc.com> Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/netfilter/ebt_ip6.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c
index 99c85668f551..17fd5f2cb4b8 100644
--- a/net/bridge/netfilter/ebt_ip6.c
+++ b/net/bridge/netfilter/ebt_ip6.c
@@ -48,10 +48,12 @@ ebt_ip6_mt(const struct sk_buff *skb, struct xt_action_param *par)
if (info->bitmask & EBT_IP6_TCLASS &&
FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))
return false;
- if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
- &info->saddr), EBT_IP6_SOURCE) ||
+ if ((info->bitmask & EBT_IP6_SOURCE &&
+ FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
+ &info->saddr), EBT_IP6_SOURCE)) ||
+ (info->bitmask & EBT_IP6_DEST &&
FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,
- &info->daddr), EBT_IP6_DEST))
+ &info->daddr), EBT_IP6_DEST)))
return false;
if (info->bitmask & EBT_IP6_PROTO) {
uint8_t nexthdr = ih6->nexthdr;