generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix broken pointer overflow check ns_name_unpack()"

Browse Source
This commit is contained in:
Calin Juravle 2014-03-07 11:46:48 +00:00 committed by Gerrit Code Review
commit b145b5ef7c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/dns/nameser/ns_name.c
View File

@ -473,11 +473,14 @@ ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
_DIAGASSERT(__type_fit(int, srcp - src + 1)); _DIAGASSERT(__type_fit(int, srcp - src + 1));
len = (int)(srcp - src + 1); len = (int)(srcp - src + 1);
} }
srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); // BEGIN android-changed: safer pointer overflow check
if (srcp < msg || srcp >= eom) { /* Out of range. */ l = (((n & 0x3f) << 8) | (*srcp & 0xff));
if (l >= eom - msg) { /* Out of range. */
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
srcp = msg + l;
// END android-changed
checked += 2; checked += 2;
/* /*
* Check for loops in the compressed name; * Check for loops in the compressed name;