Received-SPF: pass (google.com: domain of linux-kernel+bounces-2515-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <0000000000003362ba060ca8beac@google.com> <tencent_4E2FCFC90D97A5910DFA926DDD945D9B1907@qq.com>
In-Reply-To: <tencent_4E2FCFC90D97A5910DFA926DDD945D9B1907@qq.com>
From: Amir Goldstein <amir73il@gmail.com>
Date: Sun, 17 Dec 2023 11:32:16 +0200
Message-ID: <CAOQ4uxi+4-jyNY6jzNt1wG5xcYSZiSfU0AtCWtF71PSW160zRw@mail.gmail.com>
Subject: Re: [PATCH] ovl: fix BUG: Dentry still in use in unmount
To: Edward Adam Davis <eadavis@qq.com>, viro@zeniv.linux.org.uk
Cc: syzbot+8608bb4553edb8c78f41@syzkaller.appspotmail.com, chao@kernel.org, 
	jaegeuk@kernel.org, linux-f2fs-devel@lists.sourceforge.net, 
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, 
	phillip@squashfs.org.uk, reiserfs-devel@vger.kernel.org, 
	squashfs-devel@lists.sourceforge.net, syzkaller-bugs@googlegroups.com, 
	terrelln@fb.com, overlayfs <linux-unionfs@vger.kernel.org>, 
	Miklos Szeredi <miklos@szeredi.hu>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Edward,

Thanks for the quick fix, but it is incorrect.

On Sun, Dec 17, 2023 at 10:11=E2=80=AFAM Edward Adam Davis <eadavis@qq.com>=
 wrote:
>
> workdir and destdir could be the same when copying up to indexdir.

This is not the reason for the bug, the reason is:

    syzbot exercised the forbidden practice of moving the workdir under
    lowerdir while overlayfs is mounted and tripped a dentry reference leak=
.

>
> Fixes: c63e56a4a652 ("ovl: do not open/llseek lower file with upper sb_wr=
iters held")
> Reported-and-tested-by: syzbot+8608bb4553edb8c78f41@syzkaller.appspotmail=
.com
> Signed-off-by: Edward Adam Davis <eadavis@qq.com>
> ---
>  fs/overlayfs/copy_up.c | 20 +++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
> index 4382881b0709..ae5eb442025d 100644
> --- a/fs/overlayfs/copy_up.c
> +++ b/fs/overlayfs/copy_up.c
> @@ -731,10 +731,14 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_c=
tx *c)
>                 .rdev =3D c->stat.rdev,
>                 .link =3D c->link
>         };
> +       err =3D -EIO;
> +       /* workdir and destdir could be the same when copying up to index=
dir */
> +       if (lock_rename(c->workdir, c->destdir) !=3D NULL)
> +               goto unlock;

You can't do that. See comment below ovl_copy_up_data().

>
>         err =3D ovl_prep_cu_creds(c->dentry, &cc);
>         if (err)
> -               return err;
> +               goto unlock;
>
>         ovl_start_write(c->dentry);
>         inode_lock(wdir);
> @@ -743,8 +747,9 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx=
 *c)
>         ovl_end_write(c->dentry);
>         ovl_revert_cu_creds(&cc);
>
> +       err =3D PTR_ERR(temp);
>         if (IS_ERR(temp))
> -               return PTR_ERR(temp);
> +               goto unlock;
>
>         /*
>          * Copy up data first and then xattrs. Writing data after
> @@ -760,10 +765,9 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ct=
x *c)
>          * If temp was moved, abort without the cleanup.
>          */
>         ovl_start_write(c->dentry);
> -       if (lock_rename(c->workdir, c->destdir) !=3D NULL ||
> -           temp->d_parent !=3D c->workdir) {
> +       if (temp->d_parent !=3D c->workdir) {

                  dput(temp);

here is all that should be needed to fix the leak.


>                 err =3D -EIO;
> -               goto unlock;
> +               goto unlockcd;
>         } else if (err) {
>                 goto cleanup;
>         }

See my suggested fix at https://github.com/amir73il/linux/commits/ovl-fixes

Al,

Heads up.
This fix will have a minor conflict with a8b0026847b8 ("rename(): avoid
a deadlock in the case of parents having no common ancestor")
on your work.rename branch.

I plan to push my fix to linux-next soon, but I see that work.rename
is not in linux-next yet.

Thanks,
Amir.