Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe9cb3b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op 



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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 40cdc7a5

fs/nfsd/nfs4state.c

+11 −10
Original line number Diff line number Diff line
@@ -4385,10 +4385,17 @@ static __be32 check_stateid_generation(stateid_t *in, stateid_t *ref, bool has_s 
	return 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))
@@ -4418,13 +4425,7 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) 
		break;

	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);
@@ -4516,8 +4517,8 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, 
		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)