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

Commit 1cb76fec authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: nft_payload: fix wrong mac header matching 



commit d351c1ea2de3e36e608fc355d8ae7d0cc80e6cd6 upstream.

mcast packets get looped back to the local machine.
Such packets have a 0-length mac header, we should treat
this like "mac header not set" and abort rule evaluation.

As-is, we just copy data from the network header instead.

Fixes: 96518518 ("netfilter: add nftables")
Reported-by: default avatarBlažej Krajňák <krajnak@levonet.sk>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b2875b5

net/netfilter/nft_payload.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void nft_payload_eval(const struct nft_expr *expr, 


	switch (priv->base) {

	case NFT_PAYLOAD_LL_HEADER:

		if (!skb_mac_header_was_set(skb))

		if (!skb_mac_header_was_set(skb) || skb_mac_header_len(skb) == 0)

			goto err;



		if (skb_vlan_tag_present(skb)) {