Skip to content

drivers: fix CFI MTD array bounds checks #11558

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
Old-Ding wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

drivers: fix CFI MTD array bounds checks #11558

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
16 changes: 8 additions & 8 deletions components/drivers/mtd/mtd-cfi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,13 @@ static rt_err_t cfi_flash_dev_probe(struct rt_device *dev, struct cfi_flash_devi
fdev->vendor = rt_le16_to_cpu(get_unaligned(&query->primary_id));
fdev->ext_addr = rt_le16_to_cpu(get_unaligned(&query->primary_address));
num_erase_regions = query->num_erase_regions;
if (num_erase_regions > RT_ARRAY_SIZE(query->erase_region_info))
{
LOG_E("Too many %d (> %d) erase regions found",
num_erase_regions, RT_ARRAY_SIZE(query->erase_region_info));
num_erase_regions = RT_ARRAY_SIZE(query->erase_region_info);
query->num_erase_regions = num_erase_regions;
}

if (fdev->ext_addr)
{
Expand Down Expand Up @@ -1138,13 +1145,6 @@ static rt_err_t cfi_flash_dev_probe(struct rt_device *dev, struct cfi_flash_devi

for (int i = 0; i < num_erase_regions; ++i)
{
if (i > RT_ARRAY_SIZE(query->erase_region_info))
{
LOG_E("Too many %d (> %d) erase regions found",
num_erase_regions, RT_ARRAY_SIZE(query->erase_region_info));
break;
}

value = rt_le32_to_cpu(get_unaligned(&query->erase_region_info[i]));

erase_region_count = (value & 0xffff) + 1;
Expand All @@ -1158,7 +1158,7 @@ static rt_err_t cfi_flash_dev_probe(struct rt_device *dev, struct cfi_flash_devi
break;
}

if (sect_count > RT_ARRAY_SIZE(fdev->sect))
if (sect_count >= RT_ARRAY_SIZE(fdev->sect))
{
LOG_E("Too many %d (> %d) sector found",
sect_count, RT_ARRAY_SIZE(fdev->sect));
Expand Down
Loading