7ffee73524
When (re)allocating an array with very large number of elements using the MallocArray or ReallocArray macros, the calculated size of the array could overflow size_t and less memory would be allocated than requested. Add new functions for (re)allocating arrays that check the size and use them in the MallocArray and ReallocArray macros. This couldn't be exploited, because all arrays that can grow with cmdmon or NTP requests already have their size checked before allocation, or they are much smaller than memory allocated for structures to which they are related (i.e. ntp_core and sourcestats instances), so a memory allocation would fail before their size could overflow. This issue was found in an audit performed by Cure53 and sponsored by Mozilla.
43 lines
1.6 KiB
C
43 lines
1.6 KiB
C
/*
|
|
chronyd/chronyc - Programs for keeping computer clocks accurate.
|
|
|
|
**********************************************************************
|
|
* Copyright (C) Richard P. Curnow 1997-2002
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program 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
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
**********************************************************************
|
|
|
|
=======================================================================
|
|
|
|
Header file for memory functions
|
|
*/
|
|
|
|
#ifndef GOT_MEMORY_H
|
|
#define GOT_MEMORY_H
|
|
|
|
/* Wrappers checking for errors */
|
|
extern void *Malloc(size_t size);
|
|
extern void *Realloc(void *ptr, size_t size);
|
|
extern void *Malloc2(size_t nmemb, size_t size);
|
|
extern void *Realloc2(void *ptr, size_t nmemb, size_t size);
|
|
extern char *Strdup(const char *s);
|
|
|
|
/* Convenient macros */
|
|
#define MallocNew(T) ((T *) Malloc(sizeof(T)))
|
|
#define MallocArray(T, n) ((T *) Malloc2(n, sizeof(T)))
|
|
#define ReallocArray(T, n, x) ((T *) Realloc2((void *)(x), n, sizeof(T)))
|
|
#define Free(x) free(x)
|
|
|
|
#endif /* GOT_MEMORY_H */
|