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

Commit 9a6d8762 authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso
Browse files

netfilter: pkttype: unnecessary to check ipv6 multicast address 



Since there's no broadcast address in IPV6, so in ipv6 family, the
PACKET_LOOPBACK must be multicast packets, there's no need to check
it again.

Signed-off-by: default avatarLiping Zhang <zlpnobody@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ec231890

net/netfilter/nft_meta.c

+1 −4
Original line number Diff line number Diff line
@@ -154,10 +154,7 @@ void nft_meta_get_eval(const struct nft_expr *expr, 
				*dest = PACKET_BROADCAST;

			break;

		case NFPROTO_IPV6:

			if (ipv6_hdr(skb)->daddr.s6_addr[0] == 0xFF)

			*dest = PACKET_MULTICAST;

			else

				*dest = PACKET_BROADCAST;

			break;

		default:

			WARN_ON(1);

net/netfilter/xt_pkttype.c

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ pkttype_mt(const struct sk_buff *skb, struct xt_action_param *par) 
	else if (xt_family(par) == NFPROTO_IPV4 &&

	    ipv4_is_multicast(ip_hdr(skb)->daddr))

		type = PACKET_MULTICAST;

	else if (xt_family(par) == NFPROTO_IPV6 &&

	    ipv6_hdr(skb)->daddr.s6_addr[0] == 0xFF)

	else if (xt_family(par) == NFPROTO_IPV6)

		type = PACKET_MULTICAST;

	else

		type = PACKET_BROADCAST;