netfilter: nft_payload: rebuild vlan header when needed

Skip rebuilding the vlan header when accessing destination and source
mac address.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 3a3c7746e88fe6ef0bc443454788bc5650f3b6d9..8cb80098994793fb49c2ef43a2644d0c4425067b 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -171,7 +171,8 @@ void nft_payload_eval(const struct nft_expr *expr,
                if (!skb_mac_header_was_set(skb))
                        goto err;
 
-               if (skb_vlan_tag_present(skb)) {
+               if (skb_vlan_tag_present(skb) &&
+                   priv->offset >= offsetof(struct ethhdr, h_proto)) {
                        if (!nft_payload_copy_vlan(dest, skb,
                                                   priv->offset, priv->len))
                                goto err;