From 847b5649719cb933a51353142404c18585cf0a0e Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Mon, 7 Mar 2016 15:36:36 -0800 Subject: [PATCH] ofp-actions: Assert variable actions have len>0. Variable-length actions must have a nonzero length; if they don't, something went wrong and we should bail out. Suggested-by: Ben Pfaff Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- lib/ofp-actions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 905469b6b..702575d24 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -7405,7 +7405,7 @@ ofpact_finish(struct ofpbuf *ofpacts, struct ofpact *ofpact) ovs_assert(ofpact == ofpacts->header); len = (char *) ofpbuf_tail(ofpacts) - (char *) ofpact; - ovs_assert(len <= UINT16_MAX); + ovs_assert(len > 0 && len <= UINT16_MAX); ofpact->len = len; ofpbuf_padto(ofpacts, OFPACT_ALIGN(ofpacts->size)); } -- 2.20.1