X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.c;h=b33b31559f77995a738e821bfb4b447a7b009c48;hb=b121012fe9c56fc90f3e3ed8d247475812e30dbc;hp=a3ed9e83310d3d92ea9f0b6a09d34c1b03cc5d09;hpb=33b38b63e42c1f5aa80d1d7b4ce79cfbe371fae3;p=openvswitch

diff --git a/datapath/flow.c b/datapath/flow.c
index a3ed9e83..b33b3155 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -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;
 }
 
@@ -173,7 +175,7 @@ void flow_put(struct sw_flow *flow)
 		return;
 
 	if (atomic_dec_and_test(&flow->refcnt)) {
-		kfree(flow->sf_acts);
+		kfree((struct sf_flow_acts __force *)flow->sf_acts);
 		kmem_cache_free(flow_cache, flow);
 	}
 }
@@ -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;