Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0898f99a authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by Patrick McHardy
Browse files

netfilter: ebt_ip6: Use ipv6_masked_addr_cmp() 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarBart De Schuymer <bdschuym@pandora.be>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 63e690ca

net/bridge/netfilter/ebt_ip6.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) 
	struct ipv6hdr _ip6h;

	struct ipv6hdr _ip6h;

	const struct tcpudphdr *pptr;

	const struct tcpudphdr *pptr;

	struct tcpudphdr _ports;

	struct tcpudphdr _ports;

	struct in6_addr tmp_addr;

	int i;





	ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);

	ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);

	if (ih6 == NULL)

	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 &&

	if (info->bitmask & EBT_IP6_TCLASS &&

	   FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))

	   FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))

		return false;

		return false;

	for (i = 0; i < 4; i++)

	if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,

		tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] &

				       &info->saddr), EBT_IP6_SOURCE) ||

			info->smsk.in6_u.u6_addr32[i];

	    FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,

	if (info->bitmask & EBT_IP6_SOURCE &&

				       &info->daddr), EBT_IP6_DEST))

		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))

		return false;

		return false;

	if (info->bitmask & EBT_IP6_PROTO) {

	if (info->bitmask & EBT_IP6_PROTO) {

		uint8_t nexthdr = ih6->nexthdr;

		uint8_t nexthdr = ih6->nexthdr;