Unverified Commit 8d055501 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7158 v2 Squashfs: check the inode number is not the invalid value of zero 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y4KI25HUDLCSHJQARC6X2PIUB4GMXX6I/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L5DF 
 
Link:https://gitee.com/openeuler/kernel/pulls/7158

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents bb3e8f99 7b65801e

fs/squashfs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode, 
	gid_t i_gid;

	int err;



	inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);

	if (inode->i_ino == 0)

		return -EINVAL;



	err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid);

	if (err)

		return err;
@@ -71,7 +75,6 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode, 


	i_uid_write(inode, i_uid);

	i_gid_write(inode, i_gid);

	inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);

	inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime);

	inode->i_atime.tv_sec = inode->i_mtime.tv_sec;

	inode->i_ctime.tv_sec = inode->i_mtime.tv_sec;