| Message ID | 201003070918.o279IXtq029570@94.43.138.210.xn.2iij.net |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Date: Sun, 7 Mar 2010 17:39:10 +0900 > Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Patrick, I assume you'll get this. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
YOSHIFUJI Hideaki schreef: > Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> > --- > net/bridge/netfilter/ebt_ip6.c | 18 ++++-------------- > 1 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c > index bbf2534..4644cc9 100644 > --- a/net/bridge/netfilter/ebt_ip6.c > +++ b/net/bridge/netfilter/ebt_ip6.c > @@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) > struct ipv6hdr _ip6h; > const struct tcpudphdr *pptr; > struct tcpudphdr _ports; > - struct in6_addr tmp_addr; > - int i; > > ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h); > if (ih6 == NULL) > @@ -44,18 +42,10 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) > if (info->bitmask & EBT_IP6_TCLASS && > FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS)) > return false; > - for (i = 0; i < 4; i++) > - tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] & > - info->smsk.in6_u.u6_addr32[i]; > - if (info->bitmask & EBT_IP6_SOURCE && > - FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0), > - EBT_IP6_SOURCE)) > - return false; > - for (i = 0; i < 4; i++) > - tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] & > - info->dmsk.in6_u.u6_addr32[i]; > - if (info->bitmask & EBT_IP6_DEST && > - FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST)) > + if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk, > + &info->saddr), EBT_IP6_SOURCE) || > + FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk, > + &info->daddr), EBT_IP6_DEST)) > return false; > if (info->bitmask & EBT_IP6_PROTO) { > uint8_t nexthdr = ih6->nexthdr; > Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Looks OK to me. cheers, Bart
Bart De Schuymer wrote: > YOSHIFUJI Hideaki schreef: >> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> >> --- >> net/bridge/netfilter/ebt_ip6.c | 18 ++++-------------- >> 1 files changed, 4 insertions(+), 14 deletions(-) >> > Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> > > Looks OK to me. Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c index bbf2534..4644cc9 100644 --- a/net/bridge/netfilter/ebt_ip6.c +++ b/net/bridge/netfilter/ebt_ip6.c @@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) struct ipv6hdr _ip6h; const struct tcpudphdr *pptr; struct tcpudphdr _ports; - struct in6_addr tmp_addr; - int i; ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h); if (ih6 == NULL) @@ -44,18 +42,10 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) if (info->bitmask & EBT_IP6_TCLASS && FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS)) return false; - for (i = 0; i < 4; i++) - tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] & - info->smsk.in6_u.u6_addr32[i]; - if (info->bitmask & EBT_IP6_SOURCE && - FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0), - EBT_IP6_SOURCE)) - return false; - for (i = 0; i < 4; i++) - tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] & - info->dmsk.in6_u.u6_addr32[i]; - if (info->bitmask & EBT_IP6_DEST && - FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST)) + if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk, + &info->saddr), EBT_IP6_SOURCE) || + FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk, + &info->daddr), EBT_IP6_DEST)) return false; if (info->bitmask & EBT_IP6_PROTO) { uint8_t nexthdr = ih6->nexthdr;
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> --- net/bridge/netfilter/ebt_ip6.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-)