Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kenrel: Ext2 fix signed-unsigned comparisons

This commit is contained in:
Bananymous 2024-03-22 11:21:03 +02:00
parent 3c62be3f5d
commit 9ecd156622
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kernel/FS/Ext2/Inode.cpp
View File

@ -108,10 +108,10 @@ namespace Kernel
ASSERT(!mode().ifdir()); ASSERT(!mode().ifdir());
ASSERT(offset >= 0); ASSERT(offset >= 0);
if (offset >= UINT32_MAX || buffer.size() >= UINT32_MAX || buffer.size() >= (size_t)(UINT32_MAX - offset)) if (static_cast<BAN::make_unsigned_t<decltype(offset)>>(offset) >= UINT32_MAX || buffer.size() >= UINT32_MAX || buffer.size() >= (size_t)(UINT32_MAX - offset))
return BAN::Error::from_errno(EOVERFLOW); return BAN::Error::from_errno(EOVERFLOW);
if (offset >= m_inode.size) if (static_cast<BAN::make_unsigned_t<decltype(offset)>>(offset) >= m_inode.size)
return 0; return 0;
uint32_t count = buffer.size(); uint32_t count = buffer.size();
@ -152,7 +152,7 @@ namespace Kernel
ASSERT(!mode().ifdir()); ASSERT(!mode().ifdir());
ASSERT(offset >= 0); ASSERT(offset >= 0);
if (offset >= UINT32_MAX || buffer.size() >= UINT32_MAX || buffer.size() >= (size_t)(UINT32_MAX - offset)) if (static_cast<BAN::make_unsigned_t<decltype(offset)>>(offset) >= UINT32_MAX || buffer.size() >= UINT32_MAX || buffer.size() >= (size_t)(UINT32_MAX - offset))
return BAN::Error::from_errno(EOVERFLOW); return BAN::Error::from_errno(EOVERFLOW);
if (m_inode.size < offset + buffer.size()) if (m_inode.size < offset + buffer.size())
@ -304,7 +304,7 @@ done:
ASSERT(mode().ifdir()); ASSERT(mode().ifdir());
ASSERT(offset >= 0); ASSERT(offset >= 0);
if (offset >= max_used_data_block_count()) if (static_cast<BAN::make_unsigned_t<decltype(offset)>>(offset) >= max_used_data_block_count())
{ {
list->entry_count = 0; list->entry_count = 0;
return {}; return {};