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