ofp-util: Reject bad group type and command with error instead of abort.

Reported-by: Manpreet Singh <er.manpreet25@gmail.com>
Reported-at: http://openvswitch.org/pipermail/discuss/2015-October/019048.html
Signed-off-by: Ben Pfaff <blp@ovn.org>
Reviewed-by: Simon Horman <simon.horman@netronome.com>

diff --git a/AUTHORS b/AUTHORS
index e0ca51d..324ea88 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -318,6 +318,7 @@ Len Gao                 leng@vmware.com
 Logan Rosen             logatronico@gmail.com
 Luca Falavigna          dktrkranz@debian.org
 Luiz Henrique Ozaki     luiz.ozaki@gmail.com
+Manpreet Singh          er.manpreet25@gmail.com
 Marco d'Itri            md@Linux.IT
 Martin Vizvary          vizvary@ics.muni.cz
 Marvin Pascual          marvin@pascual.com.ph

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 041a470..2ebbfdd 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -8679,7 +8679,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh,
     case OFPGT11_FF:
         break;
     default:
-        OVS_NOT_REACHED();
+        return OFPERR_OFPGMFC_BAD_TYPE;
     }
 
     switch (gm->command) {
@@ -8694,7 +8694,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh,
         }
         break;
     default:
-        OVS_NOT_REACHED();
+        return OFPERR_OFPGMFC_BAD_COMMAND;
     }
 
     LIST_FOR_EACH (bucket, list_node, &gm->buckets) {