Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data[maxIndex] can only be accessed safely when maxBit is non zero. I missed this in r40143.

Browse Source 
This bug only happens for bitmaps with unusual lengths (often the last blockgroup block bitmap) and which happen to be full.
Should fix #7074.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40175 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2011-01-09 10:24:32 +00:00
parent 5c89315772
commit 847a2179d0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/kernel/file_systems/ext2/BitmapBlock.cpp
View File

@ -410,7 +410,7 @@ BitmapBlock::FindNextMarked(uint32& pos)
TRACE("BitmapBlock::FindNextMarked(): index: %lu, bit: %lu, mask: %lX, " TRACE("BitmapBlock::FindNextMarked(): index: %lu, bit: %lu, mask: %lX, "
"bits: %lX\n", index, bit, mask, bits); "bits: %lX\n", index, bit, mask, bits);
bits = bits & ~mask; bits &= ~mask;
uint32 maxBit = 32; uint32 maxBit = 32;
if (bits == 0) { if (bits == 0) {
@ -422,7 +422,6 @@ BitmapBlock::FindNextMarked(uint32& pos)
index++; index++;
} while (index < maxIndex && data[index] == 0); } while (index < maxIndex && data[index] == 0);
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
if (index >= maxIndex) { if (index >= maxIndex) {
maxBit = fNumBits & 0x1F; maxBit = fNumBits & 0x1F;
@ -433,14 +432,15 @@ BitmapBlock::FindNextMarked(uint32& pos)
pos = fNumBits; pos = fNumBits;
return; return;
} }
bits = B_LENDIAN_TO_HOST_INT32(data[maxIndex]);
mask = (1 << maxBit) - 1; mask = (1 << maxBit) - 1;
if ((bits & mask) == 0) { if ((bits & mask) == 0) {
pos = fNumBits; pos = fNumBits;
return; return;
} }
maxBit++; maxBit++;
} } else
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
bit = 0; bit = 0;
} }
@ -493,7 +493,6 @@ BitmapBlock::FindNextUnmarked(uint32& pos)
index++; index++;
} while (index < maxIndex && data[index] == 0xFFFFFFFF); } while (index < maxIndex && data[index] == 0xFFFFFFFF);
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
if (index >= maxIndex) { if (index >= maxIndex) {
maxBit = fNumBits & 0x1F; maxBit = fNumBits & 0x1F;
@ -504,13 +503,15 @@ BitmapBlock::FindNextUnmarked(uint32& pos)
pos = fNumBits; pos = fNumBits;
return; return;
} }
bits = B_LENDIAN_TO_HOST_INT32(data[maxIndex]);
mask = (1 << maxBit) - 1; mask = (1 << maxBit) - 1;
if ((bits & mask) == mask) { if ((bits & mask) == mask) {
pos = fNumBits; pos = fNumBits;
return; return;
} }
maxBit++; maxBit++;
} } else
bits = B_LENDIAN_TO_HOST_INT32(data[index]);
bit = 0; bit = 0;
} }