From: Chen Zhongjin <chenzhongjin@huawei.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: <syzbot+a4055c78774bbf3498bb@syzkaller.appspotmail.com>,
<linux-unionfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ovl: Fix use inode directly in rcu-walk mode
Date: Thu, 24 Nov 2022 21:18:00 +0800 [thread overview]
Message-ID: <6651f11c-9c56-6988-2e43-c6890fa51751@huawei.com> (raw)
In-Reply-To: <Y39nXuhwVi39nZPa@miu.piliscsaba.redhat.com>
On 2022/11/24 20:45, Miklos Szeredi wrote:
> On Thu, Nov 24, 2022 at 05:26:02PM +0800, Chen Zhongjin wrote:
>> 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>
> Hi,
>
> Thanks for the quick analysis and patch.
>
> I simplified the patch a bit without changing the attribution.
>
> Thanks,
> Miklos
>
> ----
> From: Chen Zhongjin <chenzhongjin@huawei.com>
> Subject: ovl: fix use inode directly in rcu-walk mode
>
> 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>
> Cc: <stable@vger.kernel.org> # v5.7
> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> ---
> fs/overlayfs/super.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> --- a/fs/overlayfs/super.c
> +++ b/fs/overlayfs/super.c
> @@ -139,11 +139,16 @@ static int ovl_dentry_revalidate_common(
> unsigned int flags, bool weak)
> {
> struct ovl_entry *oe = dentry->d_fsdata;
> + struct inode *inode = d_inode_rcu(dentry);
> struct dentry *upper;
> unsigned int i;
> int ret = 1;
>
> - upper = ovl_dentry_upper(dentry);
> + /* Careful in RCU mode */
> + if (!inode)
> + return -ECHILD;
> +
> + upper = ovl_i_dentry_upper(inode);
> if (upper)
> ret = ovl_revalidate_real(upper, flags, weak);
>
Thanks for review! LGTM
Best,
Chen
prev parent reply other threads:[~2022-11-24 13:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 9:26 Chen Zhongjin
2022-11-24 12:45 ` Miklos Szeredi
2022-11-24 13:18 ` Chen Zhongjin [this message]
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=6651f11c-9c56-6988-2e43-c6890fa51751@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®