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: 96518518cc41 ("netfilter: add nftables")
Reported-by: Blažej Krajňák <krajnak@levonet.sk>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 77cfd5182784ffb3a2c7fd5afb455e73683bc450..0ef51c81ec94cf79a9fd58c849f3532070b7cf2e 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -84,7 +84,7 @@ static 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)) {