From b09265a6d4deaab2749ed135f0a8a1d45f0b9379 Mon Sep 17 00:00:00 2001 From: Romain Lenglet Date: Tue, 3 Sep 2013 18:58:37 -0700 Subject: [PATCH] dpif: fix segfault in CONTROLLER action with sflow or ipfix setup Signed-off-by: Romain Lenglet Signed-off-by: Ben Pfaff --- lib/odp-execute.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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; } -- 2.43.0