Skip to content

Commit 9253c54

Browse files
plougherakpm00
authored andcommitted
Squashfs: check the inode number is not the invalid value of zero
Syskiller has produced an out of bounds access in fill_meta_index(). That out of bounds access is ultimately caused because the inode has an inode number with the invalid value of zero, which was not checked. The reason this causes the out of bounds access is due to following sequence of events: 1. Fill_meta_index() is called to allocate (via empty_meta_index()) and fill a metadata index. It however suffers a data read error and aborts, invalidating the newly returned empty metadata index. It does this by setting the inode number of the index to zero, which means unused (zero is not a valid inode number). 2. When fill_meta_index() is subsequently called again on another read operation, locate_meta_index() returns the previous index because it matches the inode number of 0. Because this index has been returned it is expected to have been filled, and because it hasn't been, an out of bounds access is performed. This patch adds a sanity check which checks that the inode number is not zero when the inode is created and returns -EINVAL if it is. [[email protected]: whitespace fix] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Phillip Lougher <[email protected]> Reported-by: "Ubisectech Sirius" <[email protected]> Closes: https://lore.kernel.org/lkml/[email protected]/ Cc: Christian Brauner <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 07a57a3 commit 9253c54

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

fs/squashfs/inode.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode,
4848
gid_t i_gid;
4949
int err;
5050

51+
inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);
52+
if (inode->i_ino == 0)
53+
return -EINVAL;
54+
5155
err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid);
5256
if (err)
5357
return err;
@@ -58,7 +62,6 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode,
5862

5963
i_uid_write(inode, i_uid);
6064
i_gid_write(inode, i_gid);
61-
inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);
6265
inode_set_mtime(inode, le32_to_cpu(sqsh_ino->mtime), 0);
6366
inode_set_atime(inode, inode_get_mtime_sec(inode), 0);
6467
inode_set_ctime(inode, inode_get_mtime_sec(inode), 0);

0 commit comments

Comments
 (0)