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 <[email protected]>
Kleist · Jun 26, 2023 · de6843b · de6843b
1 parent 4f325e2
commit de6843b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;