summaryrefslogtreecommitdiff
path: root/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-04-18 00:01:47 +0000
committerroot <root@rshg054.dnsready.net>2012-04-18 00:01:47 +0000
commit637c1cfdcd258a870ad5367cbf47a8a2799039c7 (patch)
tree04dabe84f2527ce4ef85b0905f186ebb93cacdb9 /cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
parent0fb510ac9b1defac6c3d54a68eccd7e18635b474 (diff)
Wed Apr 18 00:01:47 UTC 2012
Diffstat (limited to 'cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch')
-rw-r--r--cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
new file mode 100644
index 000000000..6f0a0398f
--- /dev/null
+++ b/cross/mips64el-unknown-linux-gnu-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
@@ -0,0 +1,24 @@
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..abccd4a 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
+ * copy without '.' if present.
+ */
+ n = strlen(name);
+- if (n >= MAXDNAME) {
++
++ /* Decrement N prior to checking it against MAXDNAME
++ so that we detect a wrap to SIZE_MAX and return
++ a reasonable error. */
++ n--;
++ if (n >= MAXDNAME - 1) {
+ RES_SET_H_ERRNO(statp, NO_RECOVERY);
+ return (-1);
+ }
+- n--;
+- if (n >= 0 && name[n] == '.') {
++ if (name[n] == '.') {
+ strncpy(nbuf, name, n);
+ nbuf[n] = '\0';
+ } else