Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-22 10:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-08 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* score/src/coremsg.c: Use 64-bit intermediate result on multiply to
	reliably detect overflow.
This commit is contained in:
Joel Sherrill
2011-07-08 16:50:53 +00:00
parent 06a36cd1a4
commit d90fef258f
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2011-07-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/src/coremsg.c: Use 64-bit intermediate result on multiply to
reliably detect overflow.
2011-07-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* libblock/src/nvdisk-sram.c, libi2c/libi2c.c,
cpukit/score/src/coremsg.c
+26 -5
View File
@@ -30,6 +30,27 @@
#include <rtems/score/thread.h>
#include <rtems/score/wkspace.h>
/*
* size_t_mult32_with_overflow
*
* This method multiplies two size_t 32-bit numbers and checks
* for overflow. It returns false if an overflow occurred and
* the result is bad.
*/
static inline bool size_t_mult32_with_overflow(
size_t a,
size_t b,
size_t *c
)
{
long long x = (long long)a*b;
if ( x > SIZE_MAX )
return false;
*c = (size_t) x;
return true;
}
/*
* _CORE_message_queue_Initialize
*
@@ -55,7 +76,7 @@ bool _CORE_message_queue_Initialize(
size_t maximum_message_size
)
{
size_t message_buffering_required;
size_t message_buffering_required = 0;
size_t allocated_message_size;
the_message_queue->maximum_pending_messages = maximum_pending_messages;
@@ -80,10 +101,10 @@ bool _CORE_message_queue_Initialize(
* Calculate how much total memory is required for message buffering and
* check for overflow on the multiplication.
*/
message_buffering_required = (size_t) maximum_pending_messages *
(allocated_message_size + sizeof(CORE_message_queue_Buffer_control));
if (message_buffering_required < allocated_message_size)
if ( !size_t_mult32_with_overflow(
(size_t) maximum_pending_messages,
allocated_message_size + sizeof(CORE_message_queue_Buffer_control),
&message_buffering_required ) )
return false;
/*