Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_18822_v5.4' into 'release/v5.4'

Browse Source 
fix(esp_partition): prevent size_t overflow bypassing bounds checks on linux target (GitHub PR) (v5.4)

See merge request espressif/esp-idf!50910
This commit is contained in:
Jiang Jiang Jian
2026-08-06 11:54:59 +08:00
parent 5b2f687142 773ddfcba1
commit 1788bf7d9e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_partition/partition_linux.c
View File

@@ -443,7 +443,7 @@ esp_err_t esp_partition_write(const esp_partition_t *partition, size_t dst_offse
if (dst_offset > partition->size) {
return ESP_ERR_INVALID_ARG;
}
if (dst_offset + size > partition->size) {
if (size > partition->size - dst_offset) {
return ESP_ERR_INVALID_SIZE;
}
@@ -499,7 +499,7 @@ esp_err_t esp_partition_read(const esp_partition_t *partition, size_t src_offset
if (src_offset > partition->size) {
return ESP_ERR_INVALID_ARG;
}
if (src_offset + size > partition->size) {
if (size > partition->size - src_offset) {
return ESP_ERR_INVALID_SIZE;
}
@@ -544,7 +544,7 @@ esp_err_t esp_partition_erase_range(const esp_partition_t *partition, size_t off
if (offset > partition->size || offset % partition->erase_size != 0) {
return ESP_ERR_INVALID_ARG;
}
if (offset + size > partition->size || size % partition->erase_size != 0) {
if (size > partition->size - offset || size % partition->erase_size != 0) {
return ESP_ERR_INVALID_SIZE;
}
@@ -596,7 +596,7 @@ esp_err_t esp_partition_mmap(const esp_partition_t *partition, size_t offset, si
if (offset > partition->size) {
return ESP_ERR_INVALID_ARG;
}
if (offset + size > partition->size) {
if (size > partition->size - offset) {
return ESP_ERR_INVALID_SIZE;
}
if (partition->flash_chip != NULL) {