From: Chen Zhongjin <chenzhongjin@huawei.com>
To: <syzbot+a4055c78774bbf3498bb@syzkaller.appspotmail.com>,
<linux-unionfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <chenzhongjin@huawei.com>, <miklos@szeredi.hu>
Subject: [PATCH] ovl: Fix use inode directly in rcu-walk mode
Date: Thu, 24 Nov 2022 17:26:02 +0800 [thread overview]
Message-ID: <20221124092602.259809-1-chenzhongjin@huawei.com> (raw)
syzkaller reported a null-ptr-deref error:
https://syzkaller.appspot.com/bug?id=bb281e89381b9ed55728c274447a575e69a96c35
ovl_dentry_revalidate_common() can be called in rcu-walk mode.
As document said, "in rcu-walk mode, d_parent and d_inode should not be
used without care". Check inode here to protect access under rcu-walk
mode.
Fixes: bccece1ead36 ("ovl: allow remote upper")
Reported-by: syzbot+a4055c78774bbf3498bb@syzkaller.appspotmail.com
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
---
fs/overlayfs/super.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index a29a8afe9b26..d61ab192dfd9 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -139,11 +139,19 @@ static int ovl_dentry_revalidate_common(struct dentry *dentry,
unsigned int flags, bool weak)
{
struct ovl_entry *oe = dentry->d_fsdata;
+ struct inode *inode;
struct dentry *upper;
unsigned int i;
int ret = 1;
- upper = ovl_dentry_upper(dentry);
+ if (flags & LOOKUP_RCU) {
+ inode = d_inode_rcu(dentry);
+ if (!inode)
+ return -ECHILD;
+ upper = ovl_upperdentry_dereference(OVL_I(inode));
+ } else
+ upper = ovl_dentry_upper(dentry);
+
if (upper)
ret = ovl_revalidate_real(upper, flags, weak);
--
2.17.1
next reply other threads:[~2022-11-24 9:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 9:26 Chen Zhongjin [this message]
2022-11-24 12:45 ` [PATCH] ovl: Fix use inode directly in rcu-walk mode Miklos Szeredi
2022-11-24 13:18 ` Chen Zhongjin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221124092602.259809-1-chenzhongjin@huawei.com \
--to=chenzhongjin@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=syzbot+a4055c78774bbf3498bb@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.