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

Commit d29b20cd authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: clean up open owners on OPEN failure 



If process_open1() creates a new open owner, but the open later fails,
the current code will leave the open owner around.  It won't be on the
close_lru list, and the client isn't expected to send a CLOSE, so it
will hang around as long as the client does.

Similarly, if process_open1() removes an existing open owner from the
close lru, anticipating that an open owner that previously had no
associated stateid's now will, but the open subsequently fails, then
we'll again be left with the same leak.

Fix both problems.

Reported-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent bcf130f9

fs/nfsd/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	 */

	status = nfsd4_process_open2(rqstp, &cstate->current_fh, open);

out:

	nfsd4_cleanup_open_state(open, status);

	if (open->op_openowner)

		cstate->replay_owner = &open->op_openowner->oo_owner;

	else

fs/nfsd/nfs4state.c

+18 −2
Original line number Diff line number Diff line
@@ -2320,7 +2320,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfs4_client *clp, str 
		return NULL;

	oo->oo_owner.so_is_open_owner = 1;

	oo->oo_owner.so_seqid = open->op_seqid;

	oo->oo_flags = 0;

	oo->oo_flags = NFS4_OO_NEW;

	oo->oo_time = 0;

	oo->oo_last_closed_stid = NULL;

	INIT_LIST_HEAD(&oo->oo_close_lru);
@@ -2526,7 +2526,6 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, 
		open->op_openowner = NULL;

		goto new_owner;

	}

	list_del_init(&oo->oo_close_lru);

	return nfsd4_check_seqid(cstate, &oo->oo_owner, open->op_seqid);

new_owner:

	oo = alloc_init_open_stateowner(strhashval, clp, open);
@@ -2946,6 +2945,23 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf 
	return status;

}



void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status)

{

	if (open->op_openowner) {

		struct nfs4_openowner *oo = open->op_openowner;



		if (!list_empty(&oo->oo_owner.so_stateids))

			list_del_init(&oo->oo_close_lru);

		if (oo->oo_flags & NFS4_OO_NEW) {

			if (status) {

				release_openowner(oo);

				open->op_openowner = NULL;

			} else

				oo->oo_flags &= ~NFS4_OO_NEW;

		}

	}

}



__be32

nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	    clientid_t *clid)

fs/nfsd/state.h

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ struct nfs4_openowner { 
	time_t			oo_time; /* time of placement on so_close_lru */

#define NFS4_OO_CONFIRMED   1

#define NFS4_OO_PURGE_CLOSE 2

#define NFS4_OO_NEW         4

	unsigned char		oo_flags;

};

fs/nfsd/xdr4.h

+1 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *, 
		struct nfsd4_open *open);

extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,

		struct svc_fh *current_fh, struct nfsd4_open *open);

extern void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status);

extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,

		struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc);

extern __be32 nfsd4_close(struct svc_rqst *rqstp,