* [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
@ 2022-11-01 11:39 Long Li
0 siblings, 0 replies; 4+ messages in thread
From: Long Li @ 2022-11-01 11:39 UTC (permalink / raw)
To: leo.lilong
Cc: Ryusuke Konishi, syzbot+2b32eb36c1a825b7a74c, Tetsuo Handa,
stable, Andrew Morton
From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
mainline inclusion
from mainline-v6.0-rc3
commit 21a87d88c2253350e115029f14fe2a10a7e6c856
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5X1Z4
CVE: CVE-2022-3621
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=21a87d88c2253350e115029f14fe2a10a7e6c856
--------------------------------
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: Long Li <leo.lilong@huawei.com>
---
fs/nilfs2/inode.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index ca380c6d7825..bfe3c7ccdf50 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -462,6 +462,8 @@ int nilfs_read_inode_common(struct inode *inode,
inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
inode->i_ctime.tv_nsec = le32_to_cpu(raw_inode->i_ctime_nsec);
inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
+ if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode))
+ return -EIO; /* this inode is for metadata and corrupted */
if (inode->i_nlink == 0)
return -ESTALE; /* this inode is deleted */
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
@ 2022-11-01 11:43 Long Li
2022-11-01 11:58 ` Long Li
2022-11-01 12:43 ` Bagas Sanjaya
0 siblings, 2 replies; 4+ messages in thread
From: Long Li @ 2022-11-01 11:43 UTC (permalink / raw)
To: patchwork, liuyongqiang13
Cc: leo.lilong, yi.zhang, houtao1, Ryusuke Konishi,
syzbot+2b32eb36c1a825b7a74c, Tetsuo Handa, stable, Andrew Morton
From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
mainline inclusion
from mainline-v6.0-rc3
commit 21a87d88c2253350e115029f14fe2a10a7e6c856
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5X1Z4
CVE: CVE-2022-3621
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=21a87d88c2253350e115029f14fe2a10a7e6c856
--------------------------------
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: Long Li <leo.lilong@huawei.com>
---
fs/nilfs2/inode.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index ca380c6d7825..bfe3c7ccdf50 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -462,6 +462,8 @@ int nilfs_read_inode_common(struct inode *inode,
inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
inode->i_ctime.tv_nsec = le32_to_cpu(raw_inode->i_ctime_nsec);
inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
+ if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode))
+ return -EIO; /* this inode is for metadata and corrupted */
if (inode->i_nlink == 0)
return -ESTALE; /* this inode is deleted */
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
2022-11-01 11:43 [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() Long Li
@ 2022-11-01 11:58 ` Long Li
2022-11-01 12:43 ` Bagas Sanjaya
1 sibling, 0 replies; 4+ messages in thread
From: Long Li @ 2022-11-01 11:58 UTC (permalink / raw)
To: patchwork, liuyongqiang13
Cc: yi.zhang, houtao1, Ryusuke Konishi, syzbot+2b32eb36c1a825b7a74c,
Tetsuo Handa, stable, Andrew Morton
On Tue, Nov 01, 2022 at 07:43:37PM +0800, Long Li wrote:
> From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
>
> mainline inclusion
> from mainline-v6.0-rc3
> commit 21a87d88c2253350e115029f14fe2a10a7e6c856
> category: bugfix
> bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5X1Z4
> CVE: CVE-2022-3621
>
> Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=21a87d88c2253350e115029f14fe2a10a7e6c856
>
> --------------------------------
>
> 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: Long Li <leo.lilong@huawei.com>
> ---
> fs/nilfs2/inode.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
> index ca380c6d7825..bfe3c7ccdf50 100644
> --- a/fs/nilfs2/inode.c
> +++ b/fs/nilfs2/inode.c
> @@ -462,6 +462,8 @@ int nilfs_read_inode_common(struct inode *inode,
> inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
> inode->i_ctime.tv_nsec = le32_to_cpu(raw_inode->i_ctime_nsec);
> inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec);
> + if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode))
> + return -EIO; /* this inode is for metadata and corrupted */
> if (inode->i_nlink == 0)
> return -ESTALE; /* this inode is deleted */
>
> --
> 2.31.1
>
Please skip this email, I made a mistake in my email, I'm very sorry
for my misoperation.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
2022-11-01 11:43 [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() Long Li
2022-11-01 11:58 ` Long Li
@ 2022-11-01 12:43 ` Bagas Sanjaya
1 sibling, 0 replies; 4+ messages in thread
From: Bagas Sanjaya @ 2022-11-01 12:43 UTC (permalink / raw)
To: Long Li, patchwork, liuyongqiang13
Cc: yi.zhang, houtao1, Ryusuke Konishi, syzbot+2b32eb36c1a825b7a74c,
Tetsuo Handa, stable, Andrew Morton
On 11/1/22 18:43, Long Li wrote:
> From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
>
> mainline inclusion
> from mainline-v6.0-rc3
> commit 21a87d88c2253350e115029f14fe2a10a7e6c856
> category: bugfix
> bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5X1Z4
> CVE: CVE-2022-3621
> > Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=21a87d88c2253350e115029f14fe2a10a7e6c856
>
Backporting for downstream kernel based on what version?
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-01 12:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-01 11:43 [PATCH openEuler-22.03-LTS] nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() Long Li
2022-11-01 11:58 ` Long Li
2022-11-01 12:43 ` Bagas Sanjaya
-- strict thread matches above, loose matches on Subject: below --
2022-11-01 11:39 Long Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).