Skip to content

Commit 4bdabd5

Browse files
Tetsuo Handagregkh
authored andcommitted
cramfs: Verify inode mode when loading from disk
[ Upstream commit 7f9d34b ] The inode mode loaded from corrupted disk can be invalid. Do like what commit 0a9e740 ("isofs: Verify inode mode when loading from disk") does. Reported-by: syzbot <syzbot+895c23f6917da440ed0d@syzkaller.appspotmail.com> Closes: https://syzkaller.appspot.com/bug?extid=895c23f6917da440ed0d Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Link: https://lore.kernel.org/429b3ef1-13de-4310-9a8e-c2dc9a36234a@I-love.SAKURA.ne.jp Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a058553 commit 4bdabd5

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

fs/cramfs/inode.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,18 @@ static struct inode *get_cramfs_inode(struct super_block *sb,
117117
inode_nohighmem(inode);
118118
inode->i_data.a_ops = &cramfs_aops;
119119
break;
120-
default:
120+
case S_IFCHR:
121+
case S_IFBLK:
122+
case S_IFIFO:
123+
case S_IFSOCK:
121124
init_special_inode(inode, cramfs_inode->mode,
122125
old_decode_dev(cramfs_inode->size));
126+
break;
127+
default:
128+
printk(KERN_DEBUG "CRAMFS: Invalid file type 0%04o for inode %lu.\n",
129+
inode->i_mode, inode->i_ino);
130+
iget_failed(inode);
131+
return ERR_PTR(-EIO);
123132
}
124133

125134
inode->i_mode = cramfs_inode->mode;

0 commit comments

Comments
 (0)