yann@1201: Original patch from: gentoo/src/patchsets/glibc/2.9/0050_all_glibc-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch yann@1201: yann@1201: -= BEGIN original header =- yann@1201: http://sourceware.org/ml/libc-alpha/2009-01/msg00000.html yann@1201: yann@1201: From 8ad7030880eaa18dcabf8e284e79026301fd3fa4 Mon Sep 17 00:00:00 2001 yann@1201: From: Ulrich Drepper yann@1201: Date: Thu, 8 Jan 2009 00:02:38 +0000 yann@1201: Subject: [PATCH] (_nss_dns_gethostbyaddr2_r): Check and adjust the buffer alignment. yann@1201: yann@1201: -= END original header =- yann@1201: yann@1201: diff -durN glibc-2_9.orig/resolv/nss_dns/dns-host.c glibc-2_9/resolv/nss_dns/dns-host.c yann@1201: --- glibc-2_9.orig/resolv/nss_dns/dns-host.c 2008-11-12 08:52:20.000000000 +0100 yann@1201: +++ glibc-2_9/resolv/nss_dns/dns-host.c 2009-02-02 22:00:36.000000000 +0100 yann@1201: @@ -364,6 +364,19 @@ yann@1201: int n, status; yann@1201: int olderr = errno; yann@1201: yann@1201: + uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data); yann@1201: + buffer += pad; yann@1201: + buflen = buflen > pad ? buflen - pad : 0; yann@1201: + yann@1201: + if (__builtin_expect (buflen < sizeof (struct host_data), 0)) yann@1201: + { yann@1201: + *errnop = ERANGE; yann@1201: + *h_errnop = NETDB_INTERNAL; yann@1201: + return NSS_STATUS_TRYAGAIN; yann@1201: + } yann@1201: + yann@1201: + host_data = (struct host_data *) buffer; yann@1201: + yann@1201: if (__res_maybe_init (&_res, 0) == -1) yann@1201: return NSS_STATUS_UNAVAIL; yann@1201: