michaelh/zephyr
1
0
Fork 0
Code Releases Activity

fs: ext2: Fix ext2 read buffer overflow

Browse source 
Keep track of the amount of bytes read so no buffer overflow occurs.

Signed-off-by: DEVER Emiel <emiel.dever@psicontrol.com>
This commit is contained in:
DEVER Emiel 2024-12-12 09:50:58 +01:00 • committed by Benjamin Cabé
commit 336c650646
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/fs/ext2/ext2_impl.c
View file

@ -611,6 +611,7 @@ ssize_t ext2_inode_read(struct ext2_inode *inode, void *buf, uint32_t offset, si
int rc = 0;
ssize_t read = 0;
uint32_t block_size = inode->i_fs->block_size;
size_t nbytes_to_read = nbytes;
while (read < nbytes && offset < inode->i_size) {
@ -624,11 +625,12 @@ ssize_t ext2_inode_read(struct ext2_inode *inode, void *buf, uint32_t offset, si
uint32_t left_on_blk = block_size - block_off;
uint32_t left_in_file = inode->i_size - offset;
size_t to_read = MIN(nbytes, MIN(left_on_blk, left_in_file));
size_t to_read = MIN(nbytes_to_read, MIN(left_on_blk, left_in_file));
memcpy((uint8_t *)buf + read, inode_current_block_mem(inode) + block_off, to_read);
read += to_read;
nbytes_to_read -= read;
offset += to_read;
}