This patch avoids a segfault that was found and documented here:
http://openvswitch.org/pipermail/discuss/2016-August/022513.html
I raised a pull-request on github.
Signed-off-by: Neil McKee <neil.mc...@inmon.com>
---
ofproto/ofproto-dpif-sflow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 1252d39..c3234ee 100644
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -1287,7 +1287,7 @@ dpif_sflow_received(struct dpif_sflow *ds, const
struct dp_packet *packet,
if (flow->tunnel.ip_dst) {
memset(&tnlInElem, 0, sizeof(tnlInElem));
tnlInElem.tag = SFLFLOW_EX_IPV4_TUNNEL_INGRESS;
- tnlInProto = dpif_sflow_tunnel_proto(in_dsp->tunnel_type);
+ tnlInProto = in_dsp ? dpif_sflow_tunnel_proto(in_dsp->tunnel_type) : 0;
dpif_sflow_tunnel_v4(tnlInProto,
&flow->tunnel,
&tnlInElem.flowType.ipv4);
--
1.9.1
------
Neil McKee
InMon Corp.
http://www.inmon.com
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
