From 6c7ef7c82e1ca0993ae6c7d5c8bc27a4daf63480 Mon Sep 17 00:00:00 2001 From: Anoob Soman Date: Wed, 14 May 2014 14:32:16 +0100 Subject: [PATCH] ofproto-dpif-xlate: Fix null pointer dereference actions (in xlate_actions__) would be NULL when xlate_actions() is called from packet_out()->ofproto_dpif_execute_actions(). This causes a NULL pointer to be dereferenced when ctx.xbridge->netflow is set. Signed-off-by: Anoob Soman Signed-off-by: Ben Pfaff --- AUTHORS | 1 + ofproto/ofproto-dpif-xlate.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 977753b5b..9364401ea 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Andrew Lambeth wal@nicira.com Andy Hill hillad@gmail.com Andy Southgate andy.southgate@citrix.com Andy Zhou azhou@nicira.com +Anob Soman anoob.soman@citrix.com Ansis Atteka aatteka@nicira.com Anupam Chanda achanda@nicira.com Arun Sharma arun.sharma@calsoftinc.com diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index f05a93d65..5be02dfa2 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -3228,11 +3228,6 @@ xlate_actions__(struct xlate_in *xin, struct xlate_out *xout) ctx.xin->resubmit_stats->n_bytes); if (ctx.xbridge->netflow) { - const struct ofpact *ofpacts; - size_t ofpacts_len; - - ofpacts_len = actions->ofpacts_len; - ofpacts = actions->ofpacts; if (ofpacts_len == 0 || ofpacts->type != OFPACT_CONTROLLER || ofpact_next(ofpacts) < ofpact_end(ofpacts, ofpacts_len)) { -- 2.20.1