From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 8 Aug 2013 18:08:03 +0000 (-0700)
Subject: ofproto-dpif-xlate: Fix rare segfault on switch exit.
X-Git-Tag: sliver-openvswitch-2.0.90-1~32^2~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=832554e35cdc042869ed14ff80174c70a678e400;p=sliver-openvswitch.git

ofproto-dpif-xlate: Fix rare segfault on switch exit.

Not all 'xport's have 'xbundle's, so this dereference is unsafe.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 00fc582e5..305067853 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -1493,7 +1493,7 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,
         }
 
         ctx->xin->flow = old_flow;
-        ctx->xbridge = xport->xbundle->xbridge;
+        ctx->xbridge = xport->xbridge;
 
         if (ctx->xin->resubmit_stats) {
             netdev_vport_inc_tx(xport->netdev, ctx->xin->resubmit_stats);