summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifeng Sun <pkusunyifeng@gmail.com>2019-02-01 15:56:04 -0800
committerBen Pfaff <blp@ovn.org>2019-02-04 12:45:18 -0800
commit23489309fecf5c656703827cc3d40ce118b440d1 (patch)
treed532f2fc25d2e9e2a80e4b22613ad91064bfcec9
parent1234d2ffc0aec1a7b3519e685d098f912a70f33b (diff)
downloadopenvswitch-branch-2.1.tar.gz
odp-util: Stop parse odp actions if nlattr is overflowbranch-2.1
`encap = nl_msg_start_nested(key, OVS_KEY_ATTR_ENCAP)` ensures that key->size >= (encap + NLA_HDRLEN), so the `if` statement is safe. Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11306 Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
-rw-r--r--lib/odp-util.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/odp-util.c b/lib/odp-util.c
index 6932cdf64..439622c5f 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -2318,6 +2318,10 @@ parse_odp_key_mask_attr(const char *s, const struct simap *port_names,
if (retval < 0) {
return retval;
}
+
+ if (nl_attr_oversized(key->size - encap - NLA_HDRLEN)) {
+ return -E2BIG;
+ }
s += retval;
}
s++;