From: Romain Lenglet <rlenglet@vmware.com>
Date: Wed, 4 Sep 2013 01:58:37 +0000 (-0700)
Subject: dpif: fix segfault in CONTROLLER action with sflow or ipfix setup
X-Git-Tag: sliver-openvswitch-2.0.90-1~16^2~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b09265a6d4deaab2749ed135f0a8a1d45f0b9379;p=sliver-openvswitch.git

dpif: fix segfault in CONTROLLER action with sflow or ipfix setup

Signed-off-by: Romain Lenglet <rlenglet@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/odp-execute.c b/lib/odp-execute.c
index 0f03855d4..c91cc4a2e 100644
--- a/lib/odp-execute.c
+++ b/lib/odp-execute.c
@@ -182,10 +182,11 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key,
             break;
 
         case OVS_ACTION_ATTR_USERSPACE: {
-            const struct nlattr *userdata;
-
-            userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA);
-            userspace(dp, packet, key, userdata);
+            if (userspace) {
+                const struct nlattr *userdata;
+                userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA);
+                userspace(dp, packet, key, userdata);
+            }
             break;
         }