ovs-openflowd: Don't segfault when no controllers specified

If no controllers are specified on the command-line, ovs-openflowd adds
a couple of its own.  The code that accounts for the controllers
correctly allocated space for them, but used the command-line count to
determine how many to set.  This led to a segfault when later code tried
to dereference them.

Reported-by: Derek Cormier <derek.cormier@lab.ntt.co.jp>

diff --git a/AUTHORS b/AUTHORS
index 3d9ddd3362caa8725b54f355f999224433b4d7c4..3364fa2b828067a8b1f1be26843fba8d5a7e42f2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,7 @@ Brad Hall               brad@nicira.com
 Brandon Heller          brandonh@stanford.edu
 Bryan Fulton            bryan@nicira.com
 Cedric Hobbs            cedric@nicira.com
+Derek Cormier           derek.cormier@lab.ntt.co.jp
 Ghanem Bahri            bahri.ghanem@gmail.com
 Henrik Amren            henrik@nicira.com
 Jad Naous               jnaous@gmail.com

diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c
index 945b11d056b4e657cbd9fa52d28b34f8322bf187..45333fd14b07763939ae5a73111b577190920be9 100644 (file)
--- a/utilities/ovs-openflowd.c
+++ b/utilities/ovs-openflowd.c
@@ -457,11 +457,9 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
     /* Set up controllers. */
     s->n_controllers = controllers.n;
     s->controllers = xmalloc(s->n_controllers * sizeof *s->controllers);
-    if (argc > 1) {
-        for (i = 0; i < s->n_controllers; i++) {
-            s->controllers[i] = controller_opts;
-            s->controllers[i].target = controllers.names[i];
-        }
+    for (i = 0; i < s->n_controllers; i++) {
+        s->controllers[i] = controller_opts;
+        s->controllers[i].target = controllers.names[i];
     }
 
     /* Sanity check. */