Commit 219d0343 authored by Dominik Ermel's avatar Dominik Ermel Committed by Anas Nashif
Browse files

storage/stream_flash: Fix range check in stream_flash_erase_page 



Added check where stream_flash_erase_page checks if requested
offset is actually within stream flash designated area.

Fixes #79800

Signed-off-by: default avatarDominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 8714c172)
parent 064fcfca

include/zephyr/storage/stream_flash.h

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ int stream_flash_erase_page(struct stream_flash_ctx *ctx, off_t off); 
 * @param settings_key key to use with the settings module for loading

 *                     the stream write progress

 *

 * @return non-negative on success, negative errno code on fail

 * @return non-negative on success, -ERANGE in case when @p off is out

 * of area designated for stream or negative errno code on fail

 */

int stream_flash_progress_load(struct stream_flash_ctx *ctx,

			       const char *settings_key);

subsys/storage/stream/stream_flash.c

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ int stream_flash_erase_page(struct stream_flash_ctx *ctx, off_t off) 
#if defined(CONFIG_FLASH_HAS_EXPLICIT_ERASE)

	int rc;

	struct flash_pages_info page;



	if (off < ctx->offset || (off - ctx->offset) >= ctx->available) {

		LOG_ERR("Offset out of designated range");

		return -ERANGE;

	}



#if defined(CONFIG_FLASH_HAS_NO_EXPLICIT_ERASE)

	/* There are both types of devices */

	const struct flash_parameters *fparams = flash_get_parameters(ctx->fdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE