Skip to content

HFS+: Validate compressed attribute record bounds #1708

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

Merged
val-ms merged 1 commit into from
Apr 27, 2026
+28 −4
Merged

HFS+: Validate compressed attribute record bounds #1708

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
32 changes: 28 additions & 4 deletions libclamav/hfsplus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,14 +610,30 @@ static cl_error_t hfsplus_check_attribute(cli_ctx *ctx, hfsPlusVolumeHeader *vol
goto done;
}

if (recordStart + sizeof(hfsPlusAttributeKey) + attrKey.nameLength >= topOfOffsets) {
uint32_t nameBytes;
uint32_t attrRecordStart;
uint32_t attrDataStart;
uint32_t bytesRemaining;

nameBytes = (uint32_t)attrKey.nameLength * 2;
attrRecordStart = recordStart + sizeof(hfsPlusAttributeKey) + nameBytes;

if (attrRecordStart >= topOfOffsets) {
cli_dbgmsg("hfsplus_check_attribute: Attribute name is longer than expected: %u\n", attrKey.nameLength);
status = CL_EFORMAT;
goto done;
}

if (attrKey.cnid == expectedCnid && attrKey.nameLength * 2 == nameLen && memcmp(&nodeBuf[recordStart + 14], name, nameLen) == 0) {
memcpy(&attrRec, &(nodeBuf[recordStart + sizeof(hfsPlusAttributeKey) + attrKey.nameLength * 2]), sizeof(attrRec));
bytesRemaining = topOfOffsets - attrRecordStart;
if (bytesRemaining < sizeof(attrRec)) {
cli_dbgmsg("hfsplus_check_attribute: Not enough data for an attribute record at location %x for %u!\n",
nextStart, recordNum);
status = CL_EFORMAT;
goto done;
}

if (attrKey.cnid == expectedCnid && nameBytes == nameLen && memcmp(&nodeBuf[recordStart + 14], name, nameLen) == 0) {
memcpy(&attrRec, &(nodeBuf[attrRecordStart]), sizeof(attrRec));
attrRec.recordType = be32_to_host(attrRec.recordType);
attrRec.attributeSize = be32_to_host(attrRec.attributeSize);

Expand All @@ -631,7 +647,15 @@ static cl_error_t hfsplus_check_attribute(cli_ctx *ctx, hfsPlusVolumeHeader *vol
goto done;
}

memcpy(record, &(nodeBuf[recordStart + sizeof(hfsPlusAttributeKey) + attrKey.nameLength * 2 + sizeof(attrRec)]), attrRec.attributeSize);
attrDataStart = attrRecordStart + sizeof(attrRec);
if (attrDataStart > topOfOffsets || topOfOffsets - attrDataStart < attrRec.attributeSize) {
cli_dbgmsg("hfsplus_check_attribute: Attribute data overruns node at location %x for %u!\n",
nextStart, recordNum);
status = CL_EFORMAT;
goto done;
}

memcpy(record, &(nodeBuf[attrDataStart]), attrRec.attributeSize);
*recordSize = attrRec.attributeSize;

if (found) {
Expand Down
Loading