From: Mark Kavanagh <mark.b.kavanagh@intel.com>
Date: Wed, 21 Feb 2018 16:15:01 +0000 (+0000)
Subject: ovs_stats: fix potential NULL-string dereference
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=39d06e521542649ceda75de781d5f83579df255f

ovs_stats: fix potential NULL-string dereference

The YAJL_GET_STRING macro may return NULL; ensure that the returned
string is non-NULL, before passing it to ovs_stats_new_port(), within
the context of the ovs_stats_update_bridge() function.

Since this change introduces another return path, a single 'failure'
return point is introduced to ovs_stats_bridge().

Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
---

diff --git a/src/ovs_stats.c b/src/ovs_stats.c
index b42bef7d..1e6ddd2d 100644
--- a/src/ovs_stats.c
+++ b/src/ovs_stats.c
@@ -362,19 +362,27 @@ static int ovs_stats_update_bridge(yajl_val bridge) {
           if (array != NULL && array_len > 0 && YAJL_IS_ARRAY(array[1])) {
             yajl_val *ports_arr = YAJL_GET_ARRAY(array[1])->values;
             size_t ports_num = YAJL_GET_ARRAY(array[1])->len;
-            for (size_t i = 0; i < ports_num && ports_arr != NULL; i++)
-              ovs_stats_new_port(
-                  br, YAJL_GET_STRING(ports_arr[i]->u.array.values[1]));
+            for (size_t i = 0; i < ports_num && ports_arr != NULL; i++) {
+              tmp = YAJL_GET_STRING(ports_arr[i]->u.array.values[1]);
+              if (tmp != NULL)
+                ovs_stats_new_port(br, tmp);
+              else
+                goto failure;
+            }
           }
         } else
           ovs_stats_new_port(br, YAJL_GET_STRING(br_ports->u.array.values[1]));
       }
     }
   } else {
-    ERROR("Incorrect JSON Bridge data");
-    return -1;
+    goto failure;
   }
+
   return 0;
+
+failure:
+  ERROR("Incorrect JSON Bridge data");
+  return -1;
 }
 
 /* Handle JSON with Bridge Table change event */