libblock: PR2145: Limit maximum read-ahead blocks

This helps to prevent stack overflows due to configuration errors.
This commit is contained in:
Sebastian Huber
2013-09-16 10:43:30 +02:00
parent a44917e789
commit 390e987eb3
8 changed files with 103 additions and 3 deletions

View File

@@ -460,7 +460,7 @@ extern const rtems_bdbuf_config rtems_bdbuf_configuration;
* @retval RTEMS_SUCCESSFUL Successful operation.
* @retval RTEMS_CALLED_FROM_ISR Called from an interrupt context.
* @retval RTEMS_INVALID_NUMBER The buffer maximum is not an integral multiple
* of the buffer minimum.
* of the buffer minimum. The maximum read-ahead blocks count is too large.
* @retval RTEMS_RESOURCE_IN_USE Already initialized.
* @retval RTEMS_UNSATISFIED Not enough resources.
*/

View File

@@ -1378,6 +1378,13 @@ rtems_bdbuf_swapout_workers_create (void)
return sc;
}
static size_t
rtems_bdbuf_read_request_size (uint32_t transfer_count)
{
return sizeof (rtems_blkdev_request)
+ sizeof (rtems_blkdev_sg_buffer) * transfer_count;
}
/**
* Initialise the cache.
*
@@ -1403,9 +1410,14 @@ rtems_bdbuf_init (void)
/*
* Check the configuration table values.
*/
if ((bdbuf_config.buffer_max % bdbuf_config.buffer_min) != 0)
return RTEMS_INVALID_NUMBER;
if (rtems_bdbuf_read_request_size (bdbuf_config.max_read_ahead_blocks)
> RTEMS_MINIMUM_STACK_SIZE / 8U)
return RTEMS_INVALID_NUMBER;
/*
* We use a special variable to manage the initialisation incase we have
* completing threads doing this. You may get errors if the another thread
@@ -2077,8 +2089,7 @@ rtems_bdbuf_execute_read_request (rtems_disk_device *dd,
*/
#define bdbuf_alloc(size) __builtin_alloca (size)
req = bdbuf_alloc (sizeof (rtems_blkdev_request) +
sizeof (rtems_blkdev_sg_buffer) * transfer_count);
req = bdbuf_alloc (rtems_bdbuf_read_request_size (transfer_count));
req->req = RTEMS_BLKDEV_REQ_READ;
req->done = rtems_bdbuf_transfer_done;