Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux.git] / net / netfilter / nft_payload.c

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 5cb2d8908d2a5d47bdedcaaf3383636708b366fc..1993af3a2979527362bfa419a73c65f71a789363 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -23,50 +23,58 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 
+static bool nft_payload_rebuild_vlan_hdr(const struct sk_buff *skb, int mac_off,
+                                        struct vlan_ethhdr *veth)
+{
+       if (skb_copy_bits(skb, mac_off, veth, ETH_HLEN))
+               return false;
+
+       veth->h_vlan_proto = skb->vlan_proto;
+       veth->h_vlan_TCI = htons(skb_vlan_tag_get(skb));
+       veth->h_vlan_encapsulated_proto = skb->protocol;
+
+       return true;
+}
+
 /* add vlan header into the user buffer for if tag was removed by offloads */
 static bool
 nft_payload_copy_vlan(u32 *d, const struct sk_buff *skb, u8 offset, u8 len)
 {
        int mac_off = skb_mac_header(skb) - skb->data;
-       u8 vlan_len, *vlanh, *dst_u8 = (u8 *) d;
+       u8 *vlanh, *dst_u8 = (u8 *) d;
        struct vlan_ethhdr veth;
+       u8 vlan_hlen = 0;
+
+       if ((skb->protocol == htons(ETH_P_8021AD) ||
+            skb->protocol == htons(ETH_P_8021Q)) &&
+           offset >= VLAN_ETH_HLEN && offset < VLAN_ETH_HLEN + VLAN_HLEN)
+               vlan_hlen += VLAN_HLEN;
 
        vlanh = (u8 *) &veth;
-       if (offset < ETH_HLEN) {
-               u8 ethlen = min_t(u8, len, ETH_HLEN - offset);
+       if (offset < VLAN_ETH_HLEN + vlan_hlen) {
+               u8 ethlen = len;
 
-               if (skb_copy_bits(skb, mac_off, &veth, ETH_HLEN))
+               if (vlan_hlen &&
+                   skb_copy_bits(skb, mac_off, &veth, VLAN_ETH_HLEN) < 0)
+                       return false;
+               else if (!nft_payload_rebuild_vlan_hdr(skb, mac_off, &veth))
                        return false;
 
-               veth.h_vlan_proto = skb->vlan_proto;
+               if (offset + len > VLAN_ETH_HLEN + vlan_hlen)
+                       ethlen -= offset + len - VLAN_ETH_HLEN + vlan_hlen;
 
-               memcpy(dst_u8, vlanh + offset, ethlen);
+               memcpy(dst_u8, vlanh + offset - vlan_hlen, ethlen);
 
                len -= ethlen;
                if (len == 0)
                        return true;
 
                dst_u8 += ethlen;
-               offset = ETH_HLEN;
-       } else if (offset >= VLAN_ETH_HLEN) {
-               offset -= VLAN_HLEN;
-               goto skip;
+               offset = ETH_HLEN + vlan_hlen;
+       } else {
+               offset -= VLAN_HLEN + vlan_hlen;
        }
 
-       veth.h_vlan_TCI = htons(skb_vlan_tag_get(skb));
-       veth.h_vlan_encapsulated_proto = skb->protocol;
-
-       vlanh += offset;
-
-       vlan_len = min_t(u8, len, VLAN_ETH_HLEN - offset);
-       memcpy(dst_u8, vlanh, vlan_len);
-
-       len -= vlan_len;
-       if (!len)
-               return true;
-
-       dst_u8 += vlan_len;
- skip:
        return skb_copy_bits(skb, offset + mac_off, dst_u8, len) == 0;
 }
 
@@ -174,6 +182,44 @@ static int nft_payload_offload_ll(struct nft_offload_ctx *ctx,
                NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_ETH_ADDRS, eth_addrs,
                                  dst, ETH_ALEN, reg);
                break;
+       case offsetof(struct ethhdr, h_proto):
+               if (priv->len != sizeof(__be16))
+                       return -EOPNOTSUPP;
+
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_BASIC, basic,
+                                 n_proto, sizeof(__be16), reg);
+               nft_offload_set_dependency(ctx, NFT_OFFLOAD_DEP_NETWORK);
+               break;
+       case offsetof(struct vlan_ethhdr, h_vlan_TCI):
+               if (priv->len != sizeof(__be16))
+                       return -EOPNOTSUPP;
+
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_VLAN, vlan,
+                                 vlan_tci, sizeof(__be16), reg);
+               break;
+       case offsetof(struct vlan_ethhdr, h_vlan_encapsulated_proto):
+               if (priv->len != sizeof(__be16))
+                       return -EOPNOTSUPP;
+
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_VLAN, vlan,
+                                 vlan_tpid, sizeof(__be16), reg);
+               nft_offload_set_dependency(ctx, NFT_OFFLOAD_DEP_NETWORK);
+               break;
+       case offsetof(struct vlan_ethhdr, h_vlan_TCI) + sizeof(struct vlan_hdr):
+               if (priv->len != sizeof(__be16))
+                       return -EOPNOTSUPP;
+
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, vlan,
+                                 vlan_tci, sizeof(__be16), reg);
+               break;
+       case offsetof(struct vlan_ethhdr, h_vlan_encapsulated_proto) +
+                                                       sizeof(struct vlan_hdr):
+               if (priv->len != sizeof(__be16))
+                       return -EOPNOTSUPP;
+
+               NFT_OFFLOAD_MATCH(FLOW_DISSECTOR_KEY_CVLAN, vlan,
+                                 vlan_tpid, sizeof(__be16), reg);
+               break;
        default:
                return -EOPNOTSUPP;
        }