Skip to content

Fix buffer overread in payload info #196

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
sandumjacob wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −1
Open

Fix buffer overread in payload info #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b95eda1
Fix buffer overread in payload info
sandumjacob Jan 31, 2026
5b5a08c
Fix buffer overread in payload info
sandumjacob Jan 31, 2026
813a88f
Merge branch 'main' of github.com:sandumjacob/libhoth
sandumjacob Feb 5, 2026
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
12 changes: 12 additions & 0 deletions protocol/payload_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,19 @@ bool libhoth_payload_info(const uint8_t* image, size_t len,
memset(payload_info->image_hash, 0, sizeof(payload_info->image_hash));
return false;
} else {
// Check for integer overflow
if (descr->descriptor_area_size <=
sizeof(struct image_descriptor) + sizeof(struct hash_sha256)) {
return false;
}

uint32_t region_size = descr->region_count * sizeof(struct image_region);
// Check for overread
if (region_size >
(descr->descriptor_area_size - sizeof(struct image_descriptor) - sizeof(struct hash_sha256))) {
return false;
}

struct hash_sha256* hash =
(struct hash_sha256*)((uint8_t*)&descr->image_regions + region_size);
memcpy(payload_info->image_hash, hash->hash, sizeof(hash->hash));
Expand Down
11 changes: 10 additions & 1 deletion protocol/payload_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,13 @@ TEST(PayloadInfotest, payload_info_non_SHA256_hash_type) {
EXPECT_FALSE(libhoth_payload_info(image, statbuf.st_size, &info));

(void)munmap(image, statbuf.st_size);
}
}

TEST(PayloadInfoTest, PayloadInfoFuzzRegression) {
std::string data = std::string(
"_IMGDSC_\035_\to\245\245IM\007\001\000\000GDS\360\360\360\360\360C_\to\245\245\267\267\342\342\342\342\342\342\342\267\267\267\267\267\267\267\267\245\245\245\245\245\245\245\251\345\034%\035\252\000\241\254\332\314\374\r\242\205\342\246\247\327Z\241\364\000\250\002\246\205\260I\002\023\255\201\277\247\247\006C\235\234\245\245\245\245\245\245\245\245\245\245\245\245\200\200\200\000\300^\000\246\270\356\027\265\035\000\245\245\245\245\245\003\003\003\245\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\000\035\035\034\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035~~~~\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035\035",
279);
struct payload_info info;
EXPECT_FALSE(libhoth_payload_info(reinterpret_cast<const uint8_t *>(data.data()),
data.size(), &info));
}
Loading