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

Kernel: Fix zero sized reads from a partition

Browse Source
This commit is contained in:
Bananymous
2026-07-20 04:07:23 +03:00
parent 51251e492e
commit 02f05436fc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kernel/Storage/Partition.cpp
+7 -5
View File
@@ -79,17 +79,19 @@ namespace Kernel
if (!device) if (!device)
return BAN::Error::from_errno(ENODEV); return BAN::Error::from_errno(ENODEV);
if (offset % device->blksize() || buffer.size() % device->blksize()) if (offset < 0 || offset % device->blksize())
return BAN::Error::from_errno(ENOTSUP); return BAN::Error::from_errno(EINVAL);
const uint32_t blocks_in_partition = m_last_block - m_first_block + 1; const uint64_t blocks_in_partition = m_last_block - m_first_block + 1;
uint32_t first_block = offset / device->blksize(); const uint64_t first_block = offset / device->blksize();
uint32_t block_count = buffer.size() / device->blksize(); uint64_t block_count = buffer.size() / device->blksize();
if (first_block >= blocks_in_partition) if (first_block >= blocks_in_partition)
return 0; return 0;
if (first_block + block_count > blocks_in_partition) if (first_block + block_count > blocks_in_partition)
block_count = blocks_in_partition - first_block; block_count = blocks_in_partition - first_block;
if (block_count == 0)
return 0;
TRY(read_blocks(first_block, block_count, buffer)); TRY(read_blocks(first_block, block_count, buffer));
return block_count * device->blksize(); return block_count * device->blksize();