Fix operation bounds check for Flash Map API #89351
Open
+21
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prevent possible overflow in is_in_flash_area_bounds while validating offset and length of an operation. Fixes zephyrproject-rtos#89349 Signed-off-by: Dominik Ermel <[email protected]>
Test integer overflow on Flash Area operation parameters. All functions call the same is_in_flash_area_bounds function for parameter verification, so it was enough to test parameter checks of flash_read. Signed-off-by: Dominik Ermel <[email protected]>
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an integer overflow vulnerability in the Flash Map API’s bounds checking function and adds test cases to verify the new behavior.
- Updated the bounds check in flash_map_priv.h to prevent overflow by splitting the addition into two comparisons.
- Added tests in tests/subsys/storage/flash_map/src/main.c to verify that overflow conditions are correctly detected.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| tests/subsys/storage/flash_map/src/main.c | Added test cases for overflow detection in bounds checking |
| subsys/storage/flash_map/flash_map_priv.h | Refactored bounds check logic to avoid integer overflows |
de-nordic
added
bug
kartben
approved these changes
Apr 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All functions area using is_in_flash_area_bounds for checking parameters; the function was not immune to integer overflow.
The PR fixes the function and adds test scenario for overflows.
Fixes #89349