[ovs-dev] [PATCH] ofp-util: Reject bad group type and command with error instead of abort.

[Ben Pfaff]

Signed-off-by: Ben Pfaff <b...@nicira.com>
Reported-by: Manpreet Singh <er.manpree...@gmail.com>
Reported-at: http://openvswitch.org/pipermail/discuss/2015-October/019048.html
---
 AUTHORS        | 1 +
 lib/ofp-util.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 99bcf60..8123f43 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -310,6 +310,7 @@ Len Gao                 l...@vmware.com
 Logan Rosen             logatron...@gmail.com
 Luca Falavigna          dktrkr...@debian.org
 Luiz Henrique Ozaki     luiz.oz...@gmail.com
+Manpreet Singh          er.manpree...@gmail.com
 Marco d'Itri            m...@linux.it
 Martin Vizvary          vizv...@ics.muni.cz
 Marvin Pascual          mar...@pascual.com.ph
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index b9dbcda..f0f6319 100644
--- 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) {
-- 
2.1.3

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev