mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +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.
		
			
				
	
	
		
			165 lines
		
	
	
		
			6.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			165 lines
		
	
	
		
			6.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Prototypes and definition for malloc implementation.
 | 
						|
   Copyright (C) 1996-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/>.  */
 | 
						|
 | 
						|
#ifndef _MALLOC_H
 | 
						|
#define _MALLOC_H 1
 | 
						|
 | 
						|
#include <features.h>
 | 
						|
#include <stddef.h>
 | 
						|
#include <stdio.h>
 | 
						|
 | 
						|
#ifdef _LIBC
 | 
						|
# define __MALLOC_HOOK_VOLATILE
 | 
						|
# define __MALLOC_DEPRECATED
 | 
						|
#else
 | 
						|
# define __MALLOC_HOOK_VOLATILE volatile
 | 
						|
# define __MALLOC_DEPRECATED __attribute_deprecated__
 | 
						|
#endif
 | 
						|
 | 
						|
 | 
						|
__BEGIN_DECLS
 | 
						|
 | 
						|
/* Allocate SIZE bytes of memory.  */
 | 
						|
extern void *malloc (size_t __size) __THROW __attribute_malloc__ __wur;
 | 
						|
 | 
						|
/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
 | 
						|
extern void *calloc (size_t __nmemb, size_t __size)
 | 
						|
__THROW __attribute_malloc__ __wur;
 | 
						|
 | 
						|
/* Re-allocate the previously allocated block in __ptr, making the new
 | 
						|
   block SIZE bytes long.  */
 | 
						|
/* __attribute_malloc__ is not used, because if realloc returns
 | 
						|
   the same pointer that was passed to it, aliasing needs to be allowed
 | 
						|
   between objects pointed by the old and new pointers.  */
 | 
						|
extern void *realloc (void *__ptr, size_t __size)
 | 
						|
__THROW __attribute_warn_unused_result__;
 | 
						|
 | 
						|
/* Re-allocate the previously allocated block in PTR, making the new
 | 
						|
   block large enough for NMEMB elements of SIZE bytes each.  */
 | 
						|
/* __attribute_malloc__ is not used, because if reallocarray returns
 | 
						|
   the same pointer that was passed to it, aliasing needs to be allowed
 | 
						|
   between objects pointed by the old and new pointers.  */
 | 
						|
extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
 | 
						|
__THROW __attribute_warn_unused_result__;
 | 
						|
 | 
						|
/* Free a block allocated by `malloc', `realloc' or `calloc'.  */
 | 
						|
extern void free (void *__ptr) __THROW;
 | 
						|
 | 
						|
/* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
 | 
						|
extern void *memalign (size_t __alignment, size_t __size)
 | 
						|
__THROW __attribute_malloc__ __wur;
 | 
						|
 | 
						|
/* Allocate SIZE bytes on a page boundary.  */
 | 
						|
extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
 | 
						|
 | 
						|
/* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up
 | 
						|
   __size to nearest pagesize. */
 | 
						|
extern void *pvalloc (size_t __size) __THROW __attribute_malloc__ __wur;
 | 
						|
 | 
						|
/* Underlying allocation function; successive calls should return
 | 
						|
   contiguous pieces of memory.  */
 | 
						|
extern void *(*__morecore) (ptrdiff_t __size);
 | 
						|
 | 
						|
/* Default value of `__morecore'.  */
 | 
						|
extern void *__default_morecore (ptrdiff_t __size)
 | 
						|
__THROW __attribute_malloc__;
 | 
						|
 | 
						|
/* SVID2/XPG mallinfo structure */
 | 
						|
 | 
						|
struct mallinfo
 | 
						|
{
 | 
						|
  int arena;    /* non-mmapped space allocated from system */
 | 
						|
  int ordblks;  /* number of free chunks */
 | 
						|
  int smblks;   /* number of fastbin blocks */
 | 
						|
  int hblks;    /* number of mmapped regions */
 | 
						|
  int hblkhd;   /* space in mmapped regions */
 | 
						|
  int usmblks;  /* always 0, preserved for backwards compatibility */
 | 
						|
  int fsmblks;  /* space available in freed fastbin blocks */
 | 
						|
  int uordblks; /* total allocated space */
 | 
						|
  int fordblks; /* total free space */
 | 
						|
  int keepcost; /* top-most, releasable (via malloc_trim) space */
 | 
						|
};
 | 
						|
 | 
						|
/* Returns a copy of the updated current mallinfo. */
 | 
						|
extern struct mallinfo mallinfo (void) __THROW;
 | 
						|
 | 
						|
/* SVID2/XPG mallopt options */
 | 
						|
#ifndef M_MXFAST
 | 
						|
# define M_MXFAST  1    /* maximum request size for "fastbins" */
 | 
						|
#endif
 | 
						|
#ifndef M_NLBLKS
 | 
						|
# define M_NLBLKS  2    /* UNUSED in this malloc */
 | 
						|
#endif
 | 
						|
#ifndef M_GRAIN
 | 
						|
# define M_GRAIN   3    /* UNUSED in this malloc */
 | 
						|
#endif
 | 
						|
#ifndef M_KEEP
 | 
						|
# define M_KEEP    4    /* UNUSED in this malloc */
 | 
						|
#endif
 | 
						|
 | 
						|
/* mallopt options that actually do something */
 | 
						|
#define M_TRIM_THRESHOLD    -1
 | 
						|
#define M_TOP_PAD           -2
 | 
						|
#define M_MMAP_THRESHOLD    -3
 | 
						|
#define M_MMAP_MAX          -4
 | 
						|
#define M_CHECK_ACTION      -5
 | 
						|
#define M_PERTURB           -6
 | 
						|
#define M_ARENA_TEST        -7
 | 
						|
#define M_ARENA_MAX         -8
 | 
						|
 | 
						|
/* General SVID/XPG interface to tunable parameters. */
 | 
						|
extern int mallopt (int __param, int __val) __THROW;
 | 
						|
 | 
						|
/* Release all but __pad bytes of freed top-most memory back to the
 | 
						|
   system. Return 1 if successful, else 0. */
 | 
						|
extern int malloc_trim (size_t __pad) __THROW;
 | 
						|
 | 
						|
/* Report the number of usable allocated bytes associated with allocated
 | 
						|
   chunk __ptr. */
 | 
						|
extern size_t malloc_usable_size (void *__ptr) __THROW;
 | 
						|
 | 
						|
/* Prints brief summary statistics on stderr. */
 | 
						|
extern void malloc_stats (void) __THROW;
 | 
						|
 | 
						|
/* Output information about state of allocator to stream FP.  */
 | 
						|
extern int malloc_info (int __options, FILE *__fp) __THROW;
 | 
						|
 | 
						|
/* Hooks for debugging and user-defined versions. */
 | 
						|
extern void (*__MALLOC_HOOK_VOLATILE __free_hook) (void *__ptr,
 | 
						|
                                                   const void *)
 | 
						|
__MALLOC_DEPRECATED;
 | 
						|
extern void *(*__MALLOC_HOOK_VOLATILE __malloc_hook)(size_t __size,
 | 
						|
                                                     const void *)
 | 
						|
__MALLOC_DEPRECATED;
 | 
						|
extern void *(*__MALLOC_HOOK_VOLATILE __realloc_hook)(void *__ptr,
 | 
						|
                                                      size_t __size,
 | 
						|
                                                      const void *)
 | 
						|
__MALLOC_DEPRECATED;
 | 
						|
extern void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t __alignment,
 | 
						|
                                                       size_t __size,
 | 
						|
                                                       const void *)
 | 
						|
__MALLOC_DEPRECATED;
 | 
						|
extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
 | 
						|
 | 
						|
/* Activate a standard set of debugging hooks. */
 | 
						|
extern void __malloc_check_init (void) __THROW __MALLOC_DEPRECATED;
 | 
						|
 | 
						|
 | 
						|
__END_DECLS
 | 
						|
#endif /* malloc.h */
 |