Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=c17f90f6c712beb2a7c2579db215852c1c986e99

commit c17f90f6c712beb2a7c2579db215852c1c986e99
Author: kikadf <[email protected]>
Date:   Wed Jan 28 14:29:57 2015 +0100

glibc-2.16.0-4arcturus3-x86_64

* Fix CVE-2015-0235

diff --git a/source/base/glibc/CVE-2015-0235.patch 
b/source/base/glibc/CVE-2015-0235.patch
new file mode 100644
index 0000000..b1b49d0
--- /dev/null
+++ b/source/base/glibc/CVE-2015-0235.patch
@@ -0,0 +1,212 @@
+diff -Naur glibc-2.16.0/nss/digits_dots.c glibc-2.16.0.new/nss/digits_dots.c
+--- glibc-2.16.0/nss/digits_dots.c     2012-06-30 21:12:34.000000000 +0200
++++ glibc-2.16.0.new/nss/digits_dots.c 2015-01-28 13:45:05.481023654 +0100
+@@ -46,7 +46,10 @@
+     {
+       if (h_errnop)
+       *h_errnop = NETDB_INTERNAL;
+-      *result = NULL;
++      if (buffer_size == NULL)
++      *status = NSS_STATUS_TRYAGAIN;
++      else
++      *result = NULL;
+       return -1;
+     }
+
+@@ -83,14 +86,16 @@
+       }
+
+       size_needed = (sizeof (*host_addr)
+-                   + sizeof (*h_addr_ptrs) + strlen (name) + 1);
++                   + sizeof (*h_addr_ptrs)
++                   + sizeof (*h_alias_ptr) + strlen (name) + 1);
+
+       if (buffer_size == NULL)
+         {
+         if (buflen < size_needed)
+           {
++            *status = NSS_STATUS_TRYAGAIN;
+             if (h_errnop != NULL)
+-              *h_errnop = TRY_AGAIN;
++              *h_errnop = NETDB_INTERNAL;
+             __set_errno (ERANGE);
+             goto done;
+           }
+@@ -109,7 +114,7 @@
+             *buffer_size = 0;
+             __set_errno (save);
+             if (h_errnop != NULL)
+-              *h_errnop = TRY_AGAIN;
++              *h_errnop = NETDB_INTERNAL;
+             *result = NULL;
+             goto done;
+           }
+@@ -149,7 +154,9 @@
+                 if (! ok)
+                   {
+                     *h_errnop = HOST_NOT_FOUND;
+-                    if (buffer_size)
++                    if (buffer_size == NULL)
++                      *status = NSS_STATUS_NOTFOUND;
++                    else
+                       *result = NULL;
+                     goto done;
+                   }
+@@ -190,7 +197,7 @@
+                 if (buffer_size == NULL)
+                   *status = NSS_STATUS_SUCCESS;
+                 else
+-                 *result = resbuf;
++                  *result = resbuf;
+                 goto done;
+               }
+
+@@ -201,15 +208,6 @@
+
+       if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == 
':')
+       {
+-        const char *cp;
+-        char *hostname;
+-        typedef unsigned char host_addr_t[16];
+-        host_addr_t *host_addr;
+-        typedef char *host_addr_list_t[2];
+-        host_addr_list_t *h_addr_ptrs;
+-        size_t size_needed;
+-        int addr_size;
+-
+         switch (af)
+           {
+           default:
+@@ -225,7 +223,10 @@
+             /* This is not possible.  We cannot represent an IPv6 address
+                in an `struct in_addr' variable.  */
+             *h_errnop = HOST_NOT_FOUND;
+-            *result = NULL;
++            if (buffer_size == NULL)
++              *status = NSS_STATUS_NOTFOUND;
++            else
++              *result = NULL;
+             goto done;
+
+           case AF_INET6:
+@@ -233,42 +234,6 @@
+             break;
+           }
+
+-        size_needed = (sizeof (*host_addr)
+-                       + sizeof (*h_addr_ptrs) + strlen (name) + 1);
+-
+-        if (buffer_size == NULL && buflen < size_needed)
+-          {
+-            if (h_errnop != NULL)
+-              *h_errnop = TRY_AGAIN;
+-            __set_errno (ERANGE);
+-            goto done;
+-          }
+-        else if (buffer_size != NULL && *buffer_size < size_needed)
+-          {
+-            char *new_buf;
+-            *buffer_size = size_needed;
+-            new_buf = realloc (*buffer, *buffer_size);
+-
+-            if (new_buf == NULL)
+-              {
+-                save = errno;
+-                free (*buffer);
+-                __set_errno (save);
+-                *buffer = NULL;
+-                *buffer_size = 0;
+-                *result = NULL;
+-                goto done;
+-              }
+-            *buffer = new_buf;
+-          }
+-
+-        memset (*buffer, '\0', size_needed);
+-
+-        host_addr = (host_addr_t *) *buffer;
+-        h_addr_ptrs = (host_addr_list_t *)
+-          ((char *) host_addr + sizeof (*host_addr));
+-        hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
+-
+         for (cp = name;; ++cp)
+           {
+             if (!*cp)
+@@ -281,7 +246,9 @@
+                 if (inet_pton (AF_INET6, name, host_addr) <= 0)
+                   {
+                     *h_errnop = HOST_NOT_FOUND;
+-                    if (buffer_size)
++                    if (buffer_size == NULL)
++                      *status = NSS_STATUS_NOTFOUND;
++                    else
+                       *result = NULL;
+                     goto done;
+                   }
+diff -Naur glibc-2.16.0/nss/getXXbyYY_r.c glibc-2.16.0.new/nss/getXXbyYY_r.c
+--- glibc-2.16.0/nss/getXXbyYY_r.c     2012-06-30 21:12:34.000000000 +0200
++++ glibc-2.16.0.new/nss/getXXbyYY_r.c 2015-01-28 13:45:05.482023654 +0100
+@@ -179,6 +179,9 @@
+     case -1:
+       return errno;
+     case 1:
++#ifdef NEED_H_ERRNO
++      any_service = true;
++#endif
+       goto done;
+     }
+ #endif
+diff -Naur glibc-2.16.0/nss/Makefile glibc-2.16.0.new/nss/Makefile
+--- glibc-2.16.0/nss/Makefile  2012-06-30 21:12:34.000000000 +0200
++++ glibc-2.16.0.new/nss/Makefile      2015-01-28 13:52:01.367041544 +0100
+@@ -38,7 +38,7 @@
+ makedb-modules = xmalloc hash-string
+ extra-objs            += $(makedb-modules:=.o)
+
+-tests                 = test-netdb tst-nss-test1
++tests                 = test-netdb tst-nss-test1 test-digits-dots
+ xtests                        = bug-erange
+
+ include ../Makeconfig
+diff -Naur glibc-2.16.0/nss/test-digits-dots.c 
glibc-2.16.0.new/nss/test-digits-dots.c
+--- glibc-2.16.0/nss/test-digits-dots.c        1970-01-01 01:00:00.000000000 
+0100
++++ glibc-2.16.0.new/nss/test-digits-dots.c    2015-01-28 13:45:05.483023654 
+0100
+@@ -0,0 +1,38 @@
++/* Copyright (C) 2013 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Testcase for BZ #15014 */
++
++#include <stdlib.h>
++#include <netdb.h>
++#include <errno.h>
++
++static int
++do_test (void)
++{
++  char buf[32];
++  struct hostent *result = NULL;
++  struct hostent ret;
++  int h_err = 0;
++  int err;
++
++  err = gethostbyname_r ("1.2.3.4", &ret, buf, sizeof (buf), &result, &h_err);
++  return err == ERANGE && h_err == NETDB_INTERNAL ? EXIT_SUCCESS : 
EXIT_FAILURE;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index 1dbc1c9..2698300 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -11,7 +11,7 @@ USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT}

pkgname=glibc
pkgver=2.16.0
-pkgrel=4arcturus2
+pkgrel=4arcturus3
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html";
depends=()
@@ -39,8 +39,8 @@ fi

# FSA fix ***
source=(${source[@]} CVE-2014-0475.patch CVE-2014-5119.patch CVE-2014-4043.patch
-                     CVE-2014-6040.patch CVE-2014-7817.patch)
-signatures=(${signatures[@]} '' '' '' '' '')
+                     CVE-2014-6040.patch CVE-2014-7817.patch 
CVE-2015-0235.patch)
+signatures=(${signatures[@]} '' '' '' '' '' '')
# ***********

build()
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to