i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bfs: Made stream code more robust against bad data.

Browse Source 
* Avoid divisions by zero. This closes ticket #13094.
This commit is contained in:
Axel Dörfler
2017-01-04 23:25:43 +01:00
parent 7894dfde26
commit 9bcf23b1a2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Inode.cpp
+7 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2014, Axel Dörfler, [email protected]. * Copyright 2001-2017, Axel Dörfler, [email protected].
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
*/ */
@@ -1431,6 +1431,8 @@ Inode::FindBlockRun(off_t pos, block_run& run, off_t& offset)
int32 indirectSize; int32 indirectSize;
get_double_indirect_sizes(data->double_indirect.Length(), get_double_indirect_sizes(data->double_indirect.Length(),
fVolume->BlockSize(), runsPerBlock, directSize, indirectSize); fVolume->BlockSize(), runsPerBlock, directSize, indirectSize);
if (directSize <= 0 || indirectSize <= 0)
RETURN_ERROR(B_BAD_DATA);
off_t start = pos - data->MaxIndirectRange(); off_t start = pos - data->MaxIndirectRange();
int32 index = start / indirectSize; int32 index = start / indirectSize;
@@ -1920,6 +1922,8 @@ Inode::_GrowStream(Transaction& transaction, off_t size)
int32 indirectSize; int32 indirectSize;
get_double_indirect_sizes(data->double_indirect.Length(), get_double_indirect_sizes(data->double_indirect.Length(),
fVolume->BlockSize(), runsPerBlock, directSize, indirectSize); fVolume->BlockSize(), runsPerBlock, directSize, indirectSize);
if (directSize <= 0 || indirectSize <= 0)
return B_BAD_DATA;
off_t start = data->MaxDoubleIndirectRange() off_t start = data->MaxDoubleIndirectRange()
- data->MaxIndirectRange(); - data->MaxIndirectRange();
@@ -2031,6 +2035,8 @@ Inode::_FreeStaticStreamArray(Transaction& transaction, int32 level,
indirectSize = double_indirect_max_direct_size(run.Length(), indirectSize = double_indirect_max_direct_size(run.Length(),
fVolume->BlockSize()); fVolume->BlockSize());
} }
if (indirectSize <= 0)
return B_BAD_DATA;
off_t start; off_t start;
if (size > offset) if (size > offset)