Patch "nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op" has been added to the 4.0-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op
to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-fix-the-check-for-confirmed-openowner-in-nfs4_preprocess_stateid_op.patch
and it can be found in the queue-4.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ebe9cb3bb13e7b9b281969cd279ce70834f7500fMon Sep 17 00:00:00 2001
From: Christoph Hellwig <[email protected]>
Date: Tue, 28 Apr 2015 15:41:15 +0200
Subject: nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op
From: Christoph Hellwig <[email protected]>
commit ebe9cb3bb13e7b9b281969cd279ce70834f7500f upstream.
If we find a non-confirmed openowner we jump to exit the function, but do not set an error value. Fix this by factoring out a helper to do the check and properly set the error from nfsd4_validate_stateid.
--- fs/nfsd/nfs4state.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/nfsd/nfs4state.c +11 -10
@@ -4386,10 +4386,17 @@ static __be32 check_stateid_generation(sreturn nfserr_old_stateid; } +static __be32 nfsd4_check_openowner_confirmed (struct nfs4_ol_stateid *ols) +{ +if (ols->st_stateowner->so_is_open_owner && + !(openowner (ols->st_stateowner)->oo_flags &NFS4_OO_CONFIRMED )) +return nfserr_bad_stateid; +return nfs_ok; +} +static __be32 nfsd4_validate_stateid (struct nfs4_client *cl,stateid_t *stateid) {struct nfs4_stid *s; -struct nfs4_ol_stateid *ols;__be32 status = nfserr_bad_stateid;if (ZERO_STATEID (stateid) ||ONE_STATEID (stateid))
@@ -4419,13 +4426,7 @@ static __be32 nfsd4_validate_stateid(strbreak ;case NFS4_OPEN_STID :case NFS4_LOCK_STID : - ols =openlockstateid (s); -if (ols->st_stateowner->so_is_open_owner - && !(openowner (ols->st_stateowner)->oo_flags - &NFS4_OO_CONFIRMED )) - status = nfserr_bad_stateid; -else - status = nfs_ok; + status =nfsd4_check_openowner_confirmed (openlockstateid (s));break ;default :printk ("unknown stateid type %x\n" , s->sc_type);
@@ -4517,8 +4518,8 @@ nfs4_preprocess_stateid_op(struct net *n status =nfs4_check_fh (current_fh, stp);if (status) goto out; -if (stp->st_stateowner->so_is_open_owner - && !(openowner (stp->st_stateowner)->oo_flags &NFS4_OO_CONFIRMED )) + status =nfsd4_check_openowner_confirmed (stp); +if (status) goto out; status =nfs4_check_openmode (stp, flags);if (status)
Patches currently in stable-queue which might be from [email protected] are
queue-4.0/nfsd-fix-the-check-for-confirmed-openowner-in-nfs4_preprocess_stateid_op.patch queue-4.0/nfsd-blocklayout-pretend-we-can-send-deviceid-notifications.patch