Properly allocate flow action blocks in user-space switch.

The user-space switch was allocating blocks to hold actions in flows that
did not include the action header.

diff --git a/switch/switch-flow.c b/switch/switch-flow.c
index a42d00fb32e60da9cd9b335b942423724723da87..133e4f89a3397df066b202f50213693da33c7d71 100644 (file)
--- a/switch/switch-flow.c
+++ b/switch/switch-flow.c
@@ -173,11 +173,12 @@ struct sw_flow *
 flow_alloc(int n_actions)
 {
     struct sw_flow_actions *sfa;
+    size_t size = sizeof *sfa + (n_actions * sizeof sfa->actions[0]);
     struct sw_flow *flow = malloc(sizeof *flow);
     if (!flow)
         return NULL;
 
-    sfa = malloc(n_actions * sizeof sfa->actions[0]);
+    sfa = malloc(size);
     if (!sfa) {
         free(flow);
         return NULL;