Message ID | 1457393798-24932-1-git-send-email-joe@ovn.org |
---|---|
State | Accepted |
Headers | show |
On Mon, Mar 07, 2016 at 03:36:36PM -0800, Joe Stringer wrote: > Variable-length actions must have a nonzero length; if they don't, > something went wrong and we should bail out. > > Suggested-by: Ben Pfaff <blp@ovn.org> > Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
On 7 March 2016 at 15:38, Ben Pfaff <blp@ovn.org> wrote: > On Mon, Mar 07, 2016 at 03:36:36PM -0800, Joe Stringer wrote: >> Variable-length actions must have a nonzero length; if they don't, >> something went wrong and we should bail out. >> >> Suggested-by: Ben Pfaff <blp@ovn.org> >> Signed-off-by: Joe Stringer <joe@ovn.org> > > Acked-by: Ben Pfaff <blp@ovn.org> Thanks, applied.
diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index a7c0388adeaa..e5fe8e608986 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -7407,7 +7407,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 && len <= UINT16_MAX); ofpact->len = len; ofpbuf_padto(ofpacts, OFPACT_ALIGN(ofpacts->size));
Variable-length actions must have a nonzero length; if they don't, something went wrong and we should bail out. Suggested-by: Ben Pfaff <blp@ovn.org> Signed-off-by: Joe Stringer <joe@ovn.org> --- lib/ofp-actions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)