commit | 2c2546b158ec41ea68fda23c884c04b13f98ce44 | [log] [tgz] |
---|---|---|
author | Ken Chen <cken@google.com> | Sun Aug 30 05:07:23 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 30 05:07:23 2020 +0000 |
tree | 7b32444c5e36195e1474d3def71189746c0c0720 | |
parent | 358c8c95725380eafe9f2aed0a4e2542592e85ff [diff] | |
parent | c5ea7569a80468665fd80ff3f987dd5ca5d2e7e1 [diff] |
Fix OOB read in DNS resolver am: 43264bc365 am: c5ea7569a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/12329970 Change-Id: I5a3ea0eb929c76e76be9a17264b7f1b6b04e9f8c
diff --git a/libc/dns/resolv/res_send.c b/libc/dns/resolv/res_send.c index a645a6b..fa81e6d 100644 --- a/libc/dns/resolv/res_send.c +++ b/libc/dns/resolv/res_send.c
@@ -948,6 +948,8 @@ else break; } + // return size should never exceed container size + resplen = anssiz; } /* * If the calling applicating has bailed out of @@ -960,7 +962,7 @@ DprintQ((statp->options & RES_DEBUG) || (statp->pfcode & RES_PRF_REPLY), (stdout, ";; old answer (unexpected):\n"), - ans, (resplen > anssiz) ? anssiz: resplen); + ans, resplen); goto read_len; }