mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

odp-util: Validate close-brace in scan_geneve and fix return values of san_xxx functions

Browse Source 
This patch adds validation of close-braces in scan_geneve. An simple
example is "set(encap(tunnel(geneve({{))))". When scan_geneve returns,
(struct geneve_scan *key)->len equals to 2*sizeof(struct geneve_opt).
That seems not correct.

Found this issue while inspecting oss-fuzz
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11153.

In addition, SCAN_TYPE expects scan_XXX functions to return 0
on errors. This patch inspects all related scan_XXX functions
and fixes their return values.

Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Yifeng Sun
2018-11-01 10:33:03 -07:00
committed by Ben Pfaff
parent f31b8ae7a7
commit 2d3deb58df
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/odp-util.c
View File

@@ -4812,7 +4812,7 @@ scan_vxlan_gbp(const char *s, uint32_t *key, uint32_t *mask)
s += 3;
len = scan_be16(s, &id, mask ? &id_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4824,7 +4824,7 @@ scan_vxlan_gbp(const char *s, uint32_t *key, uint32_t *mask)
s += 6;
len = scan_u8(s, &flags, mask ? &flags_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4858,7 +4858,7 @@ scan_erspan_metadata(const char *s,
s += 4;
len = scan_u8(s, &ver, mask ? &ver_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4872,7 +4872,7 @@ scan_erspan_metadata(const char *s,
s += 4;
len = scan_u32(s, &idx, mask ? &idx_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4892,7 +4892,7 @@ scan_erspan_metadata(const char *s,
s += 4;
len = scan_u8(s, &dir, mask ? &dir_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4903,7 +4903,7 @@ scan_erspan_metadata(const char *s,
s += 5;
len = scan_u8(s, &hwid, mask ? &hwid_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
}
@@ -4944,7 +4944,7 @@ scan_geneve(const char *s, struct geneve_scan *key, struct geneve_scan *mask)
len = scan_be16(s, &opt->opt_class,
mask ? &opt_mask->opt_class : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
} else if (mask) {
@@ -4958,7 +4958,7 @@ scan_geneve(const char *s, struct geneve_scan *key, struct geneve_scan *mask)
s += 5;
len = scan_u8(s, &opt->type, mask ? &opt_mask->type : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
} else if (mask) {
@@ -4973,7 +4973,7 @@ scan_geneve(const char *s, struct geneve_scan *key, struct geneve_scan *mask)
s += 4;
len = scan_u8(s, &opt_len, mask ? &opt_len_mask : NULL);
if (len == 0) {
return -EINVAL;
return 0;
}
s += len;
@@ -5016,6 +5016,8 @@ scan_geneve(const char *s, struct geneve_scan *key, struct geneve_scan *mask)
opt_mask += 1 + data_len / 4;
}
len_remain -= data_len;
} else {
return 0;
}
}