summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2025-08-13 00:17:44 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-19 16:31:01 +0200
commitd47cdfddeb49456ee1466b3ac5c49c949153d2bf (patch)
tree8994c390512bd166ad12522d13942a5537c6a940
parent030a01fbcc426b84ceecc616d36fcd29579d32a0 (diff)
downloadlinux-d47cdfddeb49456ee1466b3ac5c49c949153d2bf.tar.gz
linux-d47cdfddeb49456ee1466b3ac5c49c949153d2bf.tar.bz2
linux-d47cdfddeb49456ee1466b3ac5c49c949153d2bf.zip
minixfs: Verify inode mode when loading from disk
[ Upstream commit 73861970938ad1323eb02bbbc87f6fbd1e5bacca ] The inode mode loaded from corrupted disk can be invalid. Do like what commit 0a9e74051313 ("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/ec982681-84b8-4624-94fa-8af15b77cbd2@I-love.SAKURA.ne.jp Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/minix/inode.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index df575473c1cc..ee8a6fe360e7 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -470,8 +470,14 @@ void minix_set_inode(struct inode *inode, dev_t rdev)
inode->i_op = &minix_symlink_inode_operations;
inode_nohighmem(inode);
inode->i_mapping->a_ops = &minix_aops;
- } else
+ } else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
+ S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
init_special_inode(inode, inode->i_mode, rdev);
+ } else {
+ printk(KERN_DEBUG "MINIX-fs: Invalid file type 0%04o for inode %lu.\n",
+ inode->i_mode, inode->i_ino);
+ make_bad_inode(inode);
+ }
}
/*