RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Fix _Workspace_Initialize_for_one_area()

Browse Source 
In _Workspace_Initialize_for_one_area(), properly check  if there is enough
free memory available for the configured workspace size.

The bug was introduced by commit 3d0620b607.
This commit is contained in:
Sebastian Huber
2021-12-07 16:31:45 +01:00
parent e543a1695b
commit 39e6f53298
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cpukit/include/rtems/score/wkspaceinitone.h
View File

@@ -59,26 +59,29 @@ extern "C" {
*/
RTEMS_INLINE_ROUTINE void _Workspace_Initialize_for_one_area( void )
{
uintptr_t page_size;
uintptr_t wkspace_size;
uintptr_t wkspace_size_with_overhead;
uintptr_t available_size;
uintptr_t page_size;
uintptr_t wkspace_size;
uintptr_t wkspace_size_with_overhead;
const Memory_Information *mem;
Memory_Area *area;
uintptr_t free_size;
uintptr_t available_size;
page_size = CPU_HEAP_ALIGNMENT;
wkspace_size = rtems_configuration_get_work_space_size();
wkspace_size_with_overhead = wkspace_size + _Heap_Area_overhead( page_size );
if ( wkspace_size < wkspace_size_with_overhead ) {
const Memory_Information *mem;
Memory_Area *area;
uintptr_t free_size;
uintptr_t size;
mem = _Memory_Get();
_Assert( _Memory_Get_count( mem ) == 1 );
mem = _Memory_Get();
_Assert( _Memory_Get_count( mem ) == 1 );
area = _Memory_Get_area( mem, 0 );
free_size = _Memory_Get_free_size( area );
area = _Memory_Get_area( mem, 0 );
free_size = _Memory_Get_free_size( area );
if (
wkspace_size < wkspace_size_with_overhead &&
free_size >= wkspace_size_with_overhead
) {
uintptr_t size;
if ( rtems_configuration_get_unified_work_area() ) {
size = free_size;
@@ -95,7 +98,10 @@ RTEMS_INLINE_ROUTINE void _Workspace_Initialize_for_one_area( void )
_Memory_Consume( area, size );
} else {
/* An unsigned integer overflow happened */
/*
* An unsigned integer overflow happened, or the available free memory is
* not enough.
*/
available_size = 0;
}