Fix ext4 block group descriptor sizing
PATCH 1/1 Fix ext4 block group descriptor sizing
From: Benjamin Lim <[email protected]>
Signed-off-by Benjamin Lim <[email protected]>
--- fs/ext4/ext4_common.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
fs/ext4/ext4_common.c +15 -4
@@ -1584,7 +1584,7 @@ static int ext4fs_blockgroupint ext4fs_read_inode (struct ext2_data *data,int ino,struct ext2_inode *inode) { -struct ext2_block_group blkgrp; +struct ext2_block_group *blkgrp;struct ext2_sblock *sblock = &data->sblock;struct ext_filesystem *fs =get_fs ();int log2blksz =get_fs ()->dev_desc->log2blksz;
@@ -1592,17 +1592,28 @@ int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode)long int blkno;unsigned int blkoff; +/* Allocate blkgrp based on gdsize (for 64-bit support). */ + blkgrp =zalloc (get_fs ()->gdsize); +if (!blkgrp) +return 0 ; +/* It is easier to calculate if the first inode is 0. */ ino--; status =ext4fs_blockgroup (data, ino /le32_to_cpu - (sblock->inodes_per_group), &blkgrp); -if (status ==0 ) + (sblock->inodes_per_group), blkgrp); +if (status ==0 ) { +free (blkgrp);return 0 ; + } inodes_per_block =EXT2_BLOCK_SIZE (data) / fs->inodesz; - blkno =ext4fs_bg_get_inode_table_id (&blkgrp, fs) + + blkno =ext4fs_bg_get_inode_table_id (blkgrp, fs) + (ino %le32_to_cpu (sblock->inodes_per_group)) / inodes_per_block; blkoff = (ino % inodes_per_block) * fs->inodesz; + +/* Free blkgrp as it is no longer required. */ +free (blkgrp); +/* Read the inode. */ status = ext4fs_devread((lbaint_t)blkno << (LOG2_BLOCK_SIZE(data) - log2blksz), blkoff,
Signature · 1 line
2.17.1
Quoted 7 lines · Tom Rini
From: Benjamin Lim <[email protected]>
Ext4 allows for arbitrarily sized block group descriptors when 64-bit addressing is enabled, which was previously not properly supported. This patch dynamically allocates a chunk of memory of the correct size.
Signed-off-by Benjamin Lim <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190410/ab7e332b/attachment.sig>