new file mode 100644

@@ -0,0 +1,150 @@

+From af7519f7b35024224c163e32a89fb247b0c446fc Mon Sep 17 00:00:00 2001

+From: Paul Pluzhnikov <ppluzhnikov@google.com>

+Date: Tue, 8 May 2018 18:12:41 -0700

+Subject: [PATCH] Fix path length overflow in realpath [BZ #22786]

+

+Integer addition overflow may cause stack buffer overflow

+when realpath() input length is close to SSIZE_MAX.

+

+2018-05-09  Paul Pluzhnikov  <ppluzhnikov@google.com>

+

+	[BZ #22786]

+	* stdlib/canonicalize.c (__realpath): Fix overflow in path length

+	computation.

+	* stdlib/Makefile (test-bz22786): New test.

+	* stdlib/test-bz22786.c: New test.

+

+(cherry picked from commit 5460617d1567657621107d895ee2dd83bc1f88f2)

+---

+ ChangeLog             |  8 +++++

+ NEWS                  |  1 +

+ stdlib/Makefile       |  2 +-

+ stdlib/canonicalize.c |  2 +-

+ stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++

+ 5 files changed, 101 insertions(+), 2 deletions(-)

+ create mode 100644 stdlib/test-bz22786.c

+

+diff --git a/stdlib/Makefile b/stdlib/Makefile

+index 0314d59..5cdc910 100644

+--- a/stdlib/Makefile

+@@ -76,7 +76,7 @@

+ 		   tst-secure-getenv tst-strtod-overflow tst-strtod-round   \

+ 		   tst-tininess tst-strtod-underflow tst-tls-atexit	    \

+ 		   tst-setcontext3 tst-tls-atexit-nodelete		    \

+-		   tst-strtol-locale tst-strtod-nan-locale

++		   tst-strtol-locale tst-strtod-nan-locale test-bz22786

+ tests-static	:= tst-secure-getenv

+ 

+ modules-names	= tst-tls-atexit-lib

+diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c

+index c3d892c..a497d06 100644

+--- a/stdlib/canonicalize.c

+@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved)

+ 		extra_buf = __alloca (path_max);

+ 

+ 	      len = strlen (end);

+-	      if ((long int) (n + len) >= path_max)

++	      if (path_max - n <= len)

+ 		{

+ 		  __set_errno (ENAMETOOLONG);

+ 		  goto error;

+diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c

+new file mode 100644

+index 0000000..e7837f9

+--- /dev/null

+@@ -0,0 +1,90 @@

++/* Bug 22786: test for buffer overflow in realpath.

++   Copyright (C) 2018 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/>.  */

++

++/* This file must be run from within a directory called "stdlib".  */

++

++#include <errno.h>

++#include <limits.h>

++#include <stdio.h>

++#include <stdlib.h>

++#include <string.h>

++#include <unistd.h>

++#include <sys/stat.h>

++#include <sys/types.h>

++#include <support/test-driver.h>

++#include <libc-diag.h>

++

++static int

++do_test (void)

++{

++  const char dir[] = "bz22786";

++  const char lnk[] = "bz22786/symlink";

++

++  rmdir (dir);

++  if (mkdir (dir, 0755) != 0 && errno != EEXIST)

++    {

++      printf ("mkdir %s: %m\n", dir);

++      return EXIT_FAILURE;

++    }

++  if (symlink (".", lnk) != 0 && errno != EEXIST)

++    {

++      printf ("symlink (%s, %s): %m\n", dir, lnk);

++      return EXIT_FAILURE;

++    }

++

++  const size_t path_len = (size_t) INT_MAX + 1;

++

++  DIAG_PUSH_NEEDS_COMMENT;

++#if __GNUC_PREREQ (7, 0)

++  /* GCC 7 warns about too-large allocations; here we need such

++     allocation to succeed for the test to work.  */

++  DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than=");

++#endif

++  char *path = malloc (path_len);

++  DIAG_POP_NEEDS_COMMENT;

++

++  if (path == NULL)

++    {

++      printf ("malloc (%zu): %m\n", path_len);

++      return EXIT_UNSUPPORTED;

++    }

++

++  /* Construct very long path = "bz22786/symlink/aaaa....."  */

++  char *p = mempcpy (path, lnk, sizeof (lnk) - 1);

++  *(p++) = '/';

++  memset (p, 'a', path_len - (path - p) - 2);

++  p[path_len - (path - p) - 1] = '\0';

++

++  /* This call crashes before the fix for bz22786 on 32-bit platforms.  */

++  p = realpath (path, NULL);

++

++  if (p != NULL || errno != ENAMETOOLONG)

++    {

++      printf ("realpath: %s (%m)", p);

++      return EXIT_FAILURE;

++    }

++

++  /* Cleanup.  */

++  unlink (lnk);

++  rmdir (dir);

++

++  return 0;

++}

++

++#define TEST_FUNCTION do_test

++#include <support/test-driver.c>

+-- 

+2.9.3

@@ -6,7 +6,7 @@

 Summary:        Main C library

 Name:           glibc

 Version:        2.22

-Release:        20%{?dist}

+Release:        21%{?dist}

 License:        LGPLv2+

 URL:            http://www.gnu.org/software/libc

 Group:          Applications/System

@@ -49,6 +49,7 @@ Patch21:        glibc-fix-CVE-2017-16997.patch

 Patch22:        glibc-fix-CVE-2018-1000001.patch

 Patch23:        glibc-fix-CVE-2018-6485.patch

 Patch24:        glibc-fix-CVE-2017-18269.patch

+Patch25:        glibc-fix-CVE-2018-11236.patch

 Provides:       rtld(GNU_HASH)

 Requires:       filesystem

 %description

@@ -99,6 +100,8 @@ sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile

 %patch22 -p1

 %patch23 -p1

 %patch24 -p1

+%patch25 -p1

+

 install -vdm 755 %{_builddir}/%{name}-build

 # do not try to explicitly provide GLIBC_PRIVATE versioned libraries

 %define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh

@@ -225,6 +228,8 @@ popd

 %{_datarootdir}/locale/locale.alias

 %changelog

+*   Tue Jun 26 2018 Keerthana K <keerthnanak@vmware.com> 2.22-21

+-   Fix for CVE-2018-11236.

 *   Mon Jun 25 2018 Keerthana K <keerthanak@vmware.com> 2.22-20

 -   Fix for CVE-2017-18269.

 *   Tue Jan 20 2018 Xiaolin Li <xiaolinl@vmware.com> 2.22-19