Skip to content

boot: cypress: bound flash access by area size #2803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d3zd3z wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −7
Open

boot: cypress: bound flash access by area size #2803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions boot/cypress/cy_flash_pal/cy_flash_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,10 @@ int flash_area_read(const struct flash_area *fa, uint32_t off, void *dst,
int rc = 0;
size_t addr;

/* check if requested offset not less then flash area (fa) start */
assert(off < fa->fa_off);
assert(off + len < fa->fa_off);
/* check that the requested range lies inside the flash area (fa) */
if (off > fa->fa_size || len > fa->fa_size - off) {
return -1;
}
/* convert to absolute address inside a device*/
addr = fa->fa_off + off;

Expand Down Expand Up @@ -268,8 +269,10 @@ int flash_area_write(const struct flash_area *fa, uint32_t off,
size_t write_end_addr;
const uint32_t * row_ptr = NULL;

assert(off < fa->fa_off);
assert(off + len < fa->fa_off);
/* check that the requested range lies inside the flash area (fa) */
if (off > fa->fa_size || len > fa->fa_size - off) {
return -1;
}

/* convert to absolute address inside a device */
write_start_addr = fa->fa_off + off;
Expand Down Expand Up @@ -318,8 +321,11 @@ int flash_area_erase(const struct flash_area *fa, uint32_t off, uint32_t len)
size_t erase_start_addr;
size_t erase_end_addr;

assert(off < fa->fa_off);
assert(off + len < fa->fa_off);
/* check that the requested range lies inside the flash area (fa) */
if (off > fa->fa_size || len > fa->fa_size - off) {
return -1;
}

assert(!(len % CY_FLASH_SIZEOF_ROW));

/* convert to absolute address inside a device*/
Expand Down
Loading