File glibc-numeric-host-parsing-CVE-2015-0235.diff of Package glibc

Overview Repositories Revisions Requests Users Attributes Meta

File glibc-numeric-host-parsing-CVE-2015-0235.diff of Package glibc

diff -Nur glibc-2.15/nss/digits_dots.c glibc-2.15-new/nss/digits_dots.c
--- glibc-2.15/nss/digits_dots.c	2012-06-28 14:12:16.000000000 +0200
+++ glibc-2.15-new/nss/digits_dots.c	2015-01-29 12:06:31.000000000 +0100
@@ -47,7 +47,10 @@
     {
       if (h_errnop)
 	*h_errnop = NETDB_INTERNAL;
-      *result = NULL;
+      if (buffer_size == NULL)
+        *status = NSS_STATUS_TRYAGAIN;
+      else
+        *result = NULL;
       return -1;
     }
 
@@ -84,14 +87,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;
 	    }
@@ -110,7 +115,7 @@
 	      *buffer_size = 0;
 	      __set_errno (save);
 	      if (h_errnop != NULL)
-		*h_errnop = TRY_AGAIN;
+		*h_errnop = NETDB_INTERNAL;
 	      *result = NULL;
 	      goto done;
 	    }
@@ -150,7 +155,9 @@
 		  if (! ok)
 		    {
 		      *h_errnop = HOST_NOT_FOUND;
-		      if (buffer_size)
+                      if (buffer_size == NULL)
+                        *status = NSS_STATUS_NOTFOUND;
+                      else
 			*result = NULL;
 		      goto done;
 		    }
@@ -202,15 +209,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:
@@ -226,7 +224,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:
@@ -234,42 +235,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)
@@ -282,7 +247,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 -Nur glibc-2.15/nss/getXXbyYY_r.c glibc-2.15-new/nss/getXXbyYY_r.c
--- glibc-2.15/nss/getXXbyYY_r.c	2012-06-28 14:12:16.000000000 +0200
+++ glibc-2.15-new/nss/getXXbyYY_r.c	2015-01-29 12:06:31.000000000 +0100
@@ -180,6 +180,9 @@
     case -1:
       return errno;
     case 1:
+#ifdef NEED_H_ERRNO
+      any_service = true;
+#endif
       goto done;
     }
 #endif

Places

File glibc-numeric-host-parsing-CVE-2015-0235.diff of Package glibc

Places