diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-19 10:23:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-19 10:23:50 -0500 |
| commit | b80680633dc954d32f81f3afacd3d1f2f3d290b0 (patch) | |
| tree | c551b408e9b714348c1f4f34b14a23d4641021b8 /fs/squashfs/sqfs_inode.c | |
| parent | e800d715e01daffa9a5078c974f4568d6ef9e7c3 (diff) | |
| parent | dd4866b43754b18f0c06672e341d93e16b8bf674 (diff) | |
Merge branch '2020-11-18-assorted-fixes'
- Assorted SquashFS fixes and cleanups
- Fixes for various Coverity issues
- Various fixups to other platforms / code
Diffstat (limited to 'fs/squashfs/sqfs_inode.c')
| -rw-r--r-- | fs/squashfs/sqfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/sqfs_inode.c b/fs/squashfs/sqfs_inode.c index 14d70cf6789..e76ec7cbdfd 100644 --- a/fs/squashfs/sqfs_inode.c +++ b/fs/squashfs/sqfs_inode.c @@ -49,7 +49,7 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size) return sizeof(*ldir); di = ldir->index; - while (l < i_count + 1) { + while (l < i_count) { sz = get_unaligned_le32(&di->size) + 1; index_list_size += 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 + - (i_count + 1) * SQFS_DIR_INDEX_BASE_LENGTH; + i_count * SQFS_DIR_INDEX_BASE_LENGTH; } case SQFS_LREG_TYPE: { |