Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Mar 27 23:40:07 2009 +0000 (2009-03-27)
changeset 1272 ddac62e7c428
permissions -rw-r--r--
Only create the state dir if asked for a restartable build:
- introduce the config dir, where components can store their config files
- move the munged uClibc config file to the config dir
- now, the state dir really is an indication that a build can be restarted

Thanks to Groleo Marius <groleo@gmail.com> for spotting the inconsistency
of the state dir usage, and suggesting this change.

/trunk/scripts/build/libc/uClibc.sh | 6 3 3 0 +++---
/trunk/scripts/crosstool-NG.sh.in | 9 7 2 0 +++++++--
/trunk/scripts/functions | 15 12 3 0 ++++++++++++---
3 files changed, 22 insertions(+), 8 deletions(-) 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/0050_all_glibc-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch

     2 

     3 -= BEGIN original header =-

     4 http://sourceware.org/ml/libc-alpha/2009-01/msg00000.html

     5 

     6 From 8ad7030880eaa18dcabf8e284e79026301fd3fa4 Mon Sep 17 00:00:00 2001

     7 From: Ulrich Drepper <drepper@redhat.com>

     8 Date: Thu, 8 Jan 2009 00:02:38 +0000

     9 Subject: [PATCH] (_nss_dns_gethostbyaddr2_r): Check and adjust the buffer alignment.

    10 

    11 -= END original header =-

    12 

    13 diff -durN glibc-2_9.orig/resolv/nss_dns/dns-host.c glibc-2_9/resolv/nss_dns/dns-host.c

    14 --- glibc-2_9.orig/resolv/nss_dns/dns-host.c	2008-11-12 08:52:20.000000000 +0100

    15 +++ glibc-2_9/resolv/nss_dns/dns-host.c	2009-02-02 22:00:36.000000000 +0100

    16 @@ -364,6 +364,19 @@

    17    int n, status;

    18    int olderr = errno;

    19  

    20 + uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);

    21 + buffer += pad;

    22 + buflen = buflen > pad ? buflen - pad : 0;

    23 +

    24 + if (__builtin_expect (buflen < sizeof (struct host_data), 0))

    25 +   {

    26 +     *errnop = ERANGE;

    27 +     *h_errnop = NETDB_INTERNAL;

    28 +     return NSS_STATUS_TRYAGAIN;

    29 +   }

    30 +

    31 + host_data = (struct host_data *) buffer;

    32 +

    33    if (__res_maybe_init (&_res, 0) == -1)

    34      return NSS_STATUS_UNAVAIL;

    35
crosstool-ng