From: Jarno Rajahalme <jrajahalme@nicira.com>
Date: Fri, 6 Dec 2013 16:30:17 +0000 (-0800)
Subject: lib/odp-util: Only use expected_bit when set.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=df4eeb2030785e314fddcdc9fef87644b67c0149;p=sliver-openvswitch.git

lib/odp-util: Only use expected_bit when set.

parse_l2_5_onward() previously used out of range 'expected_bit' when
it was called with no attrs, which happens when parsing a mask with
zero length.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 0fd1c5159..6dbc213c2 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -2871,7 +2871,7 @@ parse_l2_5_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1],
     } else {
         goto done;
     }
-    if (is_mask) {
+    if (check_len > 0) { /* Happens only when 'is_mask'. */
         if (!is_all_zeros(check_start, check_len) &&
             flow->dl_type != htons(0xffff)) {
             return ODP_FIT_ERROR;