diff options
author | 2016-11-10 01:35:27 (GMT) | |
---|---|---|
committer | 2016-11-10 01:35:27 (GMT) | |
commit | a76c549823fd0063de999786b6dc583847db091e (patch) | |
tree | 04a51e165125497bbcb1b1d8865958c4cd14de5b /patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | |
parent | 23e9a03a3f4a5eaded6cadbe4d808997879450d1 (diff) | |
parent | dc280e477d6af7702e2481c17af20a7db83814d9 (diff) |
Merge pull request #452 from KirillSmirnov/janitorial
Janitorial: update patches
Diffstat (limited to 'patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch')
-rw-r--r-- | patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch b/patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch deleted file mode 100644 index dedb03f..0000000 --- a/patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch +++ /dev/null @@ -1,35 +0,0 @@ -Original patch from: gentoo/src/patchsets/glibc/2.9/0050_all_glibc-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch - --= BEGIN original header =- -http://sourceware.org/ml/libc-alpha/2009-01/msg00000.html - -From 8ad7030880eaa18dcabf8e284e79026301fd3fa4 Mon Sep 17 00:00:00 2001 -From: Ulrich Drepper <drepper@redhat.com> -Date: Thu, 8 Jan 2009 00:02:38 +0000 -Subject: [PATCH] (_nss_dns_gethostbyaddr2_r): Check and adjust the buffer alignment. - --= END original header =- - -diff -durN glibc-2_9.orig/resolv/nss_dns/dns-host.c glibc-2_9/resolv/nss_dns/dns-host.c ---- glibc-2_9.orig/resolv/nss_dns/dns-host.c 2008-11-12 08:52:20.000000000 +0100 -+++ glibc-2_9/resolv/nss_dns/dns-host.c 2009-02-02 22:00:36.000000000 +0100 -@@ -364,6 +364,19 @@ - int n, status; - int olderr = errno; - -+ uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data); -+ buffer += pad; -+ buflen = buflen > pad ? buflen - pad : 0; -+ -+ if (__builtin_expect (buflen < sizeof (struct host_data), 0)) -+ { -+ *errnop = ERANGE; -+ *h_errnop = NETDB_INTERNAL; -+ return NSS_STATUS_TRYAGAIN; -+ } -+ -+ host_data = (struct host_data *) buffer; -+ - if (__res_maybe_init (&_res, 0) == -1) - return NSS_STATUS_UNAVAIL; - |