Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
From:   "NeilBrown" <neilb@suse.de>
To:     "Jeff Layton" <jlayton@kernel.org>
Cc:     "Chuck Lever" <chuck.lever@oracle.com>,
        "Zhi Li" <yieli@redhat.com>, linux-nfs@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] nfsd: make a copy of struct iattr before calling notify_change
In-reply-to: <20230517162645.254512-1-jlayton@kernel.org>
References: <20230517162645.254512-1-jlayton@kernel.org>
Date:   Mon, 22 May 2023 12:45:37 +1000
Message-id: <168472353748.5298.2381558773846767023@noble.neil.brown.name>
Precedence: bulk

On Thu, 18 May 2023, Jeff Layton wrote:
> notify_change can modify the iattr structure. In particular it can can
> end up setting ATTR_MODE when ATTR_KILL_SUID is already set, causing a
> BUG() if the same iattr is passed to notify_change more than once.
>=20
> Make a copy of the struct iattr before calling notify_change.
>=20
> Fixes: 34b91dda7124 NFSD: Make nfsd4_setattr() wait before returning NFS4ER=
R_DELAY
> Link: https://bugzilla.redhat.com/show_bug.cgi?id=3D2207969
> Reported-by: Zhi Li <yieli@redhat.com>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/nfsd/vfs.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index c4ef24c5ffd0..ad0c5cd900b1 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -538,7 +538,9 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
> =20
>  	inode_lock(inode);
>  	for (retries =3D 1;;) {
> -		host_err =3D __nfsd_setattr(dentry, iap);
> +		struct iattr attrs =3D *iap;
> +
> +		host_err =3D __nfsd_setattr(dentry, &attrs);

I think this needs something to ensure a well meaning by-passer doesn't
try to "optimise" it back to the way it was.
Maybe make "iap" const?  Or add a comment?  Or both?

NeilBrown


>  		if (host_err !=3D -EAGAIN || !retries--)
>  			break;
>  		if (!nfsd_wait_for_delegreturn(rqstp, inode))
> --=20
> 2.40.1
>=20
>=20