aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add overflow detection for DDT entries to prevent data loss

Browse Source
This commit is contained in:
Natalia Portillo
2025-09-30 12:35:36 +01:00
parent c122839733
commit 0260bcb4c3
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/ddt/ddt_v2.c
View File

@@ -806,15 +806,30 @@ void set_ddt_single_level_v2(aaruformatContext *ctx, uint64_t sectorAddress, boo
uint64_t ddtEntry = 0; uint64_t ddtEntry = 0;
uint64_t blockIndex = blockOffset >> ctx->userDataDdtHeader.blockAlignmentShift; uint64_t blockIndex = blockOffset >> ctx->userDataDdtHeader.blockAlignmentShift;
ddtEntry = offset & (1ULL << ctx->userDataDdtHeader.dataShift) - 1 | blockIndex << ctx->userDataDdtHeader.dataShift; ddtEntry = offset & ((1ULL << ctx->userDataDdtHeader.dataShift) - 1) | blockIndex
<< ctx->userDataDdtHeader.dataShift;
if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType) if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFF)
{
FATAL("DDT overflow: media does not fit in small DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 12; ddtEntry |= (uint64_t)sectorStatus << 12;
ctx->cachedSecondaryDdtSmall[sectorAddress] = (uint16_t)ddtEntry; ctx->cachedSecondaryDdtSmall[sectorAddress] = (uint16_t)ddtEntry;
} }
else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType) else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFFFFFF)
{
FATAL("DDT overflow: media does not fit in big DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 28; ddtEntry |= (uint64_t)sectorStatus << 28;
ctx->cachedSecondaryDdtBig[sectorAddress] = (uint32_t)ddtEntry; ctx->cachedSecondaryDdtBig[sectorAddress] = (uint32_t)ddtEntry;
} }
@@ -887,12 +902,26 @@ void set_ddt_multi_level_v2(aaruformatContext *ctx, uint64_t sectorAddress, bool
if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType) if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFF)
{
FATAL("DDT overflow: media does not fit in small DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 12; ddtEntry |= (uint64_t)sectorStatus << 12;
TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry); TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry);
ctx->cachedSecondaryDdtSmall[sectorAddress % itemsPerDdtEntry] = (uint16_t)ddtEntry; ctx->cachedSecondaryDdtSmall[sectorAddress % itemsPerDdtEntry] = (uint16_t)ddtEntry;
} }
else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType) else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFFFFFF)
{
FATAL("DDT overflow: media does not fit in big DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 28; ddtEntry |= (uint64_t)sectorStatus << 28;
TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry); TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry);
ctx->cachedSecondaryDdtBig[sectorAddress % itemsPerDdtEntry] = (uint32_t)ddtEntry; ctx->cachedSecondaryDdtBig[sectorAddress % itemsPerDdtEntry] = (uint32_t)ddtEntry;
@@ -1315,12 +1344,26 @@ void set_ddt_multi_level_v2(aaruformatContext *ctx, uint64_t sectorAddress, bool
if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType) if(ctx->userDataDdtHeader.sizeType == SmallDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFF)
{
FATAL("DDT overflow: media does not fit in small DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 12; ddtEntry |= (uint64_t)sectorStatus << 12;
TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry); TRACE("Setting small secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint16_t)ddtEntry);
ctx->cachedSecondaryDdtSmall[sectorAddress % itemsPerDdtEntry] = (uint16_t)ddtEntry; ctx->cachedSecondaryDdtSmall[sectorAddress % itemsPerDdtEntry] = (uint16_t)ddtEntry;
} }
else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType) else if(ctx->userDataDdtHeader.sizeType == BigDdtSizeType)
{ {
// Overflow detection for DDT entry
if(ddtEntry > 0xFFFFFFF)
{
FATAL("DDT overflow: media does not fit in big DDT");
return;
}
ddtEntry |= (uint64_t)sectorStatus << 28; ddtEntry |= (uint64_t)sectorStatus << 28;
TRACE("Setting big secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint32_t)ddtEntry); TRACE("Setting big secondary DDT entry %d to %u", sectorAddress % itemsPerDdtEntry, (uint32_t)ddtEntry);
ctx->cachedSecondaryDdtBig[sectorAddress % itemsPerDdtEntry] = (uint32_t)ddtEntry; ctx->cachedSecondaryDdtBig[sectorAddress % itemsPerDdtEntry] = (uint32_t)ddtEntry;