Skip to content

Commit 7a5aa54

Browse files
Tetsuo Handakleikamp
authored andcommitted
jfs: Verify inode mode when loading from disk
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> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
1 parent 5aca796 commit 7a5aa54

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

fs/jfs/inode.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,15 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)
5959
*/
6060
inode->i_link[inode->i_size] = '\0';
6161
}
62-
} else {
62+
} else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
63+
S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
6364
inode->i_op = &jfs_file_inode_operations;
6465
init_special_inode(inode, inode->i_mode, inode->i_rdev);
66+
} else {
67+
printk(KERN_DEBUG "JFS: Invalid file type 0%04o for inode %lu.\n",
68+
inode->i_mode, inode->i_ino);
69+
iget_failed(inode);
70+
return ERR_PTR(-EIO);
6571
}
6672
unlock_new_inode(inode);
6773
return inode;

0 commit comments

Comments
 (0)