mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	The reallocarray function is an extension from OpenBSD. It is an integer-overflow-safe replacement for realloc(p, X*Y) and malloc(X*Y) (realloc(NULL, X*Y)). It can therefore help in preventing certain security issues in code. This is an updated version of a patch originally submitted by Rüdiger Sonderfeld in May 2014 [1]. Checked on i686-linux-gnu and x86_64-linux-gnu. [1] <https://sourceware.org/ml/libc-alpha/2014-05/msg00481.html>. 2017-05-30 Dennis Wölfing <denniswoelfing@gmx.de> Rüdiger Sonderfeld <ruediger@c-plusplus.de> * include/stdlib.h (__libc_reallocarray): New declaration. * malloc/Makefile (routines): Add reallocarray. (tests): Add tst-reallocarray.c. * malloc/Versions: Add reallocarray and __libc_reallocarray. * malloc/malloc-internal.h (check_mul_overflow_size_t): New inline function. * malloc/malloc.h (reallocarray): New declaration. * stdlib/stdlib.h (reallocarray): Likewise. * malloc/reallocarray.c: New file. * malloc/tst-reallocarray.c: New test file. * manual/memory.texi: Document reallocarray. * sysdeps/unix/sysv/linux/aarch64/libc.abilist: Add reallocarray. * sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/arm/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/hppa/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/i386/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/microblaze/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/nios2/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/sh/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/tilepro/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise.
		
			
				
	
	
		
			119 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			119 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Test for reallocarray.
 | |
|    Copyright (C) 2017 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/>.  */
 | |
| 
 | |
| #include <errno.h>
 | |
| #include <malloc.h>
 | |
| #include <string.h>
 | |
| #include <support/check.h>
 | |
| 
 | |
| static int
 | |
| do_test (void)
 | |
| {
 | |
|   void *ptr = NULL;
 | |
|   void *ptr2 = NULL;
 | |
|   unsigned char *c;
 | |
|   size_t i;
 | |
|   int ok;
 | |
|   const size_t max = ~(size_t)0;
 | |
|   size_t a, b;
 | |
| 
 | |
|   /* Test overflow detection.  */
 | |
|   errno = 0;
 | |
|   ptr = reallocarray (NULL, max, 2);
 | |
|   TEST_VERIFY (!ptr);
 | |
|   TEST_VERIFY (errno == ENOMEM);
 | |
| 
 | |
|   errno = 0;
 | |
|   ptr = reallocarray (NULL, 2, max);
 | |
|   TEST_VERIFY (!ptr);
 | |
|   TEST_VERIFY (errno == ENOMEM);
 | |
| 
 | |
|   a = 65537;
 | |
|   b = max/65537 + 1;
 | |
|   errno = 0;
 | |
|   ptr = reallocarray (NULL, a, b);
 | |
|   TEST_VERIFY (!ptr);
 | |
|   TEST_VERIFY (errno == ENOMEM);
 | |
| 
 | |
|   errno = 0;
 | |
|   ptr = reallocarray (NULL, b, a);
 | |
|   TEST_VERIFY (!ptr);
 | |
|   TEST_VERIFY (errno == ENOMEM);
 | |
| 
 | |
|   /* Test realloc-like behavior.  */
 | |
|   /* Allocate memory like malloc.  */
 | |
|   ptr = reallocarray (NULL, 10, 2);
 | |
|   TEST_VERIFY_EXIT (ptr);
 | |
|   TEST_VERIFY_EXIT (malloc_usable_size (ptr) >= 10*2);
 | |
| 
 | |
|   memset (ptr, 0xAF, 10*2);
 | |
| 
 | |
|   /* Enlarge buffer.   */
 | |
|   ptr2 = reallocarray (ptr, 20, 2);
 | |
|   TEST_VERIFY (ptr2);
 | |
|   if (ptr2)
 | |
|     ptr = ptr2;
 | |
|   TEST_VERIFY (malloc_usable_size (ptr) >= 20*2);
 | |
| 
 | |
|   c = ptr;
 | |
|   ok = 1;
 | |
|   for (i = 0; i < 10*2; ++i)
 | |
|     {
 | |
|       if (c[i] != 0xAF)
 | |
|         ok = 0;
 | |
|     }
 | |
|   TEST_VERIFY (ok);
 | |
| 
 | |
|   /* Decrease buffer size.  */
 | |
|   ptr2 = reallocarray (ptr, 5, 3);
 | |
|   TEST_VERIFY (ptr2);
 | |
|   if (ptr2)
 | |
|     ptr = ptr2;
 | |
|   TEST_VERIFY_EXIT (malloc_usable_size (ptr) >= 5*3);
 | |
| 
 | |
|   c = ptr;
 | |
|   ok = 1;
 | |
|   for (i = 0; i < 5*3; ++i)
 | |
|     {
 | |
|       if (c[i] != 0xAF)
 | |
|         ok = 0;
 | |
|     }
 | |
|   TEST_VERIFY (ok);
 | |
| 
 | |
|   /* Overflow should leave buffer untouched.  */
 | |
|   errno = 0;
 | |
|   ptr2 = reallocarray (ptr, 2, ~(size_t)0);
 | |
|   TEST_VERIFY (!ptr2);
 | |
|   TEST_VERIFY (errno == ENOMEM);
 | |
| 
 | |
|   c = ptr;
 | |
|   ok = 1;
 | |
|   for (i = 0; i < 5*3; ++i)
 | |
|     {
 | |
|       if (c[i] != 0xAF)
 | |
|         ok = 0;
 | |
|     }
 | |
|   TEST_VERIFY (ok);
 | |
| 
 | |
|   free (ptr);
 | |
| 
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| #include <support/test-driver.c>
 |