datapath: Fix type of actions_len_left in modify_vlan_tci().

[openvswitch] / datapath / flow.c

diff --git a/datapath/flow.c b/datapath/flow.c
index d30fb73fa21595a154112bdd527bd9ee51e20776..5cf0d54a7839860519c9f7337e1890f220c8db95 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -31,7 +31,7 @@
 
 #include "compat.h"
 
-struct kmem_cache *flow_cache;
+static struct kmem_cache *flow_cache;
 static unsigned int hash_seed __read_mostly;
 
 static inline bool arphdr_ok(struct sk_buff *skb)
@@ -104,22 +104,24 @@ void flow_used(struct sw_flow *flow, struct sk_buff *skb)
        spin_unlock_bh(&flow->lock);
 }
 
-struct sw_flow_actions *flow_actions_alloc(size_t n_actions)
+struct sw_flow_actions *flow_actions_alloc(u32 actions_len)
 {
        struct sw_flow_actions *sfa;
 
+       if (actions_len % NLA_ALIGNTO)
+               return ERR_PTR(-EINVAL);
+
        /* At least DP_MAX_PORTS actions are required to be able to flood a
         * packet to every port.  Factor of 2 allows for setting VLAN tags,
         * etc. */
-       if (n_actions > 2 * DP_MAX_PORTS)
+       if (actions_len > 2 * DP_MAX_PORTS * nla_total_size(4))
                return ERR_PTR(-EINVAL);
 
-       sfa = kmalloc(sizeof *sfa + n_actions * sizeof(union odp_action),
-                     GFP_KERNEL);
+       sfa = kmalloc(sizeof *sfa + actions_len, GFP_KERNEL);
        if (!sfa)
                return ERR_PTR(-ENOMEM);
 
-       sfa->n_actions = n_actions;
+       sfa->actions_len = actions_len;
        return sfa;
 }
 
@@ -216,7 +218,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)
                u8  ssap;  /* Always 0xAA */
                u8  ctrl;
                u8  oui[3];
-               u16 ethertype;
+               __be16 ethertype;
        };
        struct llc_snap_hdr *llc;
        __be16 proto;