oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

asn1: Fix binary search off-by-one read

Browse Source 
Previously, if left==right==A1_HEADER_LEN(tos), this would read past the
end of the template array. Now we treat [left, right) as a half-open
interval and no longer try to read from 'right'.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Joseph Sutton
2021-12-13 12:04:58 +13:00
committed by Nico Williams
parent d8af2eb730
commit b8f8906822
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/asn1/template.c
View File

@@ -566,7 +566,7 @@ _asn1_decode_open_type(const struct asn1_template *t,
const void *vp = DPO(data, ttypeid->offset); const void *vp = DPO(data, ttypeid->offset);
int c = -1; int c = -1;
while (left <= right) { while (left < right) {
size_t mid = (left + right) >> 1; size_t mid = (left + right) >> 1;
if ((tos[3 + mid * 3].tt & A1_OP_MASK) != A1_OP_OPENTYPE_ID) if ((tos[3 + mid * 3].tt & A1_OP_MASK) != A1_OP_OPENTYPE_ID)
@@ -577,10 +577,7 @@ _asn1_decode_open_type(const struct asn1_template *t,
else if (typeid_is_oid) else if (typeid_is_oid)
c = der_heim_oid_cmp(vp, tos[3 + mid * 3].ptr); c = der_heim_oid_cmp(vp, tos[3 + mid * 3].ptr);
if (c < 0) { if (c < 0) {
if (mid) right = mid;
right = mid - 1;
else
break;
} else if (c > 0) { } else if (c > 0) {
left = mid + 1; left = mid + 1;
} else { } else {