Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b239ca1dba58169a8e66bb27ab6cd4dc7550930c

Authored by Ryusuke Konishi
Committed by Jason Liu
1 parent dbaf3ee66b
Exists in smarc_imx_lf-5.15.y and in 2 other branches emb_imx_lf-5.15.y, rt_linux_5.15.71

nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() 

commit 21a87d88c2253350e115029f14fe2a10a7e6c856 upstream.

If the i_mode field in inode of metadata files is corrupted on disk, it
can cause the initialization of bmap structure, which should have been
called from nilfs_read_inode_common(), not to be called.  This causes a
lockdep warning followed by a NULL pointer dereference at
nilfs_bmap_lookup_at_level().

This patch fixes these issues by adding a missing sanitiy check for the
i_mode field of metadata file's inode.

Link: https://lkml.kernel.org/r/20221002030804.29978-1-konishi.ryusuke@gmail.com
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Reported-by: syzbot+2b32eb36c1a825b7a74c@syzkaller.appspotmail.com
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 1e512c65b4adcdbdf7aead052f2162b079cc7f55)

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

... ... @@ -444,6 +444,8 @@
444 444 inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
445 445 inode->i_ctime.tv_nsec = le32_to_cpu(raw_inode->i_ctime_nsec);
446 446 inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
  447 + if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode))
  448 + return -EIO; /* this inode is for metadata and corrupted */
447 449 if (inode->i_nlink == 0)
448 450 return -ESTALE; /* this inode is deleted */
449 451