Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-07-14 Joel Sherrill <joel@OARcorp.com>

Browse Source 
PR 650/rtems
	* score/src/coremsg.c: Check for mathemathical overflow when calculating
	amount of memory to allocate for message buffers.
This commit is contained in:
Joel Sherrill
2004-07-14 21:05:15 +00:00
parent a0f29ca4fd
commit 9b63fbf867
2 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-07-14 Joel Sherrill <joel@OARcorp.com>
PR 650/rtems
* score/src/coremsg.c: Check for mathemathical overflow when calculating
amount of memory to allocate for message buffers.
2004-07-14 Joel Sherrill <joel@OARcorp.com>
PR 651/core

34
cpukit/score/src/coremsg.c
View File

@@ -51,12 +51,12 @@
boolean _CORE_message_queue_Initialize(
CORE_message_queue_Control *the_message_queue,
CORE_message_queue_Attributes *the_message_queue_attributes,
uint32_t maximum_pending_messages,
uint32_t maximum_message_size
unsigned32 maximum_pending_messages,
unsigned32 maximum_message_size
)
{
uint32_t message_buffering_required;
uint32_t allocated_message_size;
unsigned32 message_buffering_required;
unsigned32 allocated_message_size;
the_message_queue->maximum_pending_messages = maximum_pending_messages;
the_message_queue->number_of_pending_messages = 0;
@@ -64,24 +64,42 @@ boolean _CORE_message_queue_Initialize(
_CORE_message_queue_Set_notify( the_message_queue, NULL, NULL );
/*
* round size up to multiple of a ptr for chain init
* Round size up to multiple of a pointer for chain init and
* check for overflow on adding overhead to each message.
*/
allocated_message_size = maximum_message_size;
if (allocated_message_size & (sizeof(uint32_t ) - 1)) {
allocated_message_size += sizeof(uint32_t );
allocated_message_size &= ~(sizeof(uint32_t ) - 1);
if (allocated_message_size & (sizeof(unsigned32) - 1)) {
allocated_message_size += sizeof(unsigned32);
allocated_message_size &= ~(sizeof(unsigned32) - 1);
}
if (allocated_message_size < maximum_message_size)
return FALSE;
/*
* Calculate how much total memory is required for message buffering and
* check for overflow on the multiplication.
*/
message_buffering_required = maximum_pending_messages *
(allocated_message_size + sizeof(CORE_message_queue_Buffer_control));
if (message_buffering_required < allocated_message_size)
return FALSE;
/*
* Attempt to allocate the message memory
*/
the_message_queue->message_buffers = (CORE_message_queue_Buffer *)
_Workspace_Allocate( message_buffering_required );
if (the_message_queue->message_buffers == 0)
return FALSE;
/*
* Initialize the pool of inactive messages, pending messages,
* and set of waiting threads.
*/
_Chain_Initialize (
&the_message_queue->Inactive_messages,
the_message_queue->message_buffers,