dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fs/squashfs: Fix index off by 1 for inode SQFS_LDIR_TYPE

Browse Source 
I've created a squashfs file system with Yocto (it use squashfs-tools)
and u-boot command sqfsls give the error:'Error while searching inode:
unknown type.'
After some digging in the code I found that the index is off by 1.
This patch fix this issue and I can successful use the sqfsls command.
After search for the squashfs format I found a link talk about a
similar issue but this time in the documentation. The link is:
https://github.com/AgentD/squashfs-tools-ng/commit/e6588526838caece9529

Signed-off-by: Gerard Koskamp <gerard.koskamp@nedap.com>
Tested-by: Joao Marcos Costa <joaomarcos.costa@bootlin.com>
This commit is contained in:
Gerard Koskamp
2020-10-30 13:41:58 +00:00
committed by Tom Rini
parent e04072536e
commit c49b0eb034
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/squashfs/sqfs_inode.c
View File

@@ -49,7 +49,7 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
return sizeof(*ldir); return sizeof(*ldir);
di = ldir->index; di = ldir->index;
while (l < i_count + 1) { while (l < i_count) {
sz = get_unaligned_le32(&di->size) + 1; sz = get_unaligned_le32(&di->size) + 1;
index_list_size += sz; index_list_size += sz;
di = (void *)di + sizeof(*di) + sz; di = (void *)di + sizeof(*di) + sz;
@@ -57,7 +57,7 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
} }
return sizeof(*ldir) + index_list_size + return sizeof(*ldir) + index_list_size +
(i_count + 1) * SQFS_DIR_INDEX_BASE_LENGTH; i_count * SQFS_DIR_INDEX_BASE_LENGTH;
} }
case SQFS_LREG_TYPE: { case SQFS_LREG_TYPE: {