rtems: Fix rtems_partition_return_buffer()

The rtems_partition_return_buffer() wrongly accepted which were exactly
at the buffer area end.  Use the buffer area limit address for the range
checking.

Close #4490.
This commit is contained in:
Sebastian Huber
2021-08-12 10:09:04 +02:00
parent 59472042ec
commit 9399e12c21
5 changed files with 30 additions and 17 deletions
+1 -1
View File
@@ -192,7 +192,7 @@ typedef struct {
rtems_name name;
/* end of common portion */
rtems_attribute attribute;
void * start_addr;
const void * start_addr;
uint32_t length;
uint32_t buf_size;
uint32_t used_blocks;
+10 -5
View File
@@ -48,15 +48,20 @@ typedef struct {
ISR_LOCK_MEMBER( Lock )
/**
* @brief This member contains the physical starting address of the buffer
* area.
* @brief This member contains the base address of the buffer area.
*
* The base address is the address of the first byte contained in the buffer
* area.
*/
void *starting_address;
const void *base_address;
/**
* @brief This member contains the size of the buffer area in bytes.
* @brief This member contains the limit address of the buffer area.
*
* The limit address is the address of the last byte contained in the buffer
* area.
*/
uintptr_t length;
const void *limit_address;
/**
* @brief This member contains the size of each buffer in bytes.
+3 -2
View File
@@ -22,8 +22,9 @@ rtems_monitor_part_canonical(
const Partition_Control *rtems_part = (const Partition_Control *) part_void;
canonical_part->attribute = rtems_part->attribute_set;
canonical_part->start_addr = rtems_part->starting_address;
canonical_part->length = rtems_part->length;
canonical_part->start_addr = rtems_part->base_address;
canonical_part->length = (uint32_t) ( (uintptr_t)
rtems_part->limit_address + 1 - (uintptr_t) rtems_part->base_address );
canonical_part->buf_size = rtems_part->buffer_size;
canonical_part->used_blocks = rtems_part->number_of_used_blocks;
}
+6 -2
View File
@@ -23,6 +23,7 @@
#include <rtems/rtems/partimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/support.h>
#include <rtems/score/address.h>
#include <rtems/score/chainimpl.h>
#include <rtems/score/sysstate.h>
#include <rtems/sysinit.h>
@@ -40,8 +41,11 @@ static void _Partition_Initialize(
rtems_attribute attribute_set
)
{
the_partition->starting_address = starting_address;
the_partition->length = length;
const void *limit_address;
limit_address = _Addresses_Add_offset( starting_address, length - 1 );
the_partition->base_address = starting_address;
the_partition->limit_address = limit_address;
the_partition->buffer_size = buffer_size;
the_partition->attribute_set = attribute_set;
the_partition->number_of_used_blocks = 0;
+10 -7
View File
@@ -33,7 +33,7 @@ static bool _Partition_Is_address_on_buffer_boundary(
offset = _Addresses_Subtract(
the_buffer,
the_partition->starting_address
the_partition->base_address
);
return ( offset % the_partition->buffer_size ) == 0;
@@ -44,14 +44,17 @@ static bool _Partition_Is_address_a_buffer_begin(
const void *the_buffer
)
{
void *starting;
void *ending;
const void *base;
const void *limit;
starting = the_partition->starting_address;
ending = _Addresses_Add_offset( starting, the_partition->length );
base = the_partition->base_address;
limit = the_partition->limit_address;
return _Addresses_Is_in_range( the_buffer, starting, ending )
&& _Partition_Is_address_on_buffer_boundary( the_partition, the_buffer );
if ( !_Addresses_Is_in_range( the_buffer, base, limit ) ) {
return false;
}
return _Partition_Is_address_on_buffer_boundary( the_partition, the_buffer );
}
static void _Partition_Free_buffer(