diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-04-20 19:30:35 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-04-20 20:33:03 +0200 |
commit | 51defd927427b5b74c3a0c0f0b5c161929547cfc (patch) | |
tree | 7b7dc7a66a95427b3e420f45bd9f1a27ecc4dcf1 /cpukit/libcsupport/src/rtemscalloc.c | |
parent | malloc: Hide RTEMS_Malloc_Sbrk_amount (diff) | |
download | rtems-51defd927427b5b74c3a0c0f0b5c161929547cfc.tar.bz2 |
Fix calloc() behaviour in case of overflow
The multiplication to calculate the length of the memory area to
allocate may overflow. Return NULL in case of an overflow.
Close #4389.
Diffstat (limited to 'cpukit/libcsupport/src/rtemscalloc.c')
-rw-r--r-- | cpukit/libcsupport/src/rtemscalloc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpukit/libcsupport/src/rtemscalloc.c b/cpukit/libcsupport/src/rtemscalloc.c index 4e189e8367..836f1da64d 100644 --- a/cpukit/libcsupport/src/rtemscalloc.c +++ b/cpukit/libcsupport/src/rtemscalloc.c @@ -46,7 +46,14 @@ void *rtems_calloc( size_t nelem, size_t elsize ) size_t length; void *p; - length = nelem * elsize; + if ( nelem == 0 ) { + length = 0; + } else if ( elsize > SIZE_MAX / nelem ) { + return NULL; + } else { + length = nelem * elsize; + } + p = rtems_malloc( length ); RTEMS_OBFUSCATE_VARIABLE( p ); if ( RTEMS_PREDICT_FALSE( p == NULL ) ) { |