[PATCH] nfsd4: fix struct file leak (c907132d) · Commits · 戴 / test

We were failing to close on an error path, resulting in a leak of struct files which could take a v4 server down fairly quickly.... So call nfs4_close_delegation instead of just open-coding parts of it. Simplify the cleanup on delegation failure while we're at it. Signed-off-by:

J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by:

Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

fs/nfsd/nfs4state.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ nfs4_close_delegation(struct nfs4_delegation *dp)
		dp->dl_vfs_file = NULL;
		/* The following nfsd_close may not actually close the file,
		* but we want to remove the lease in any case. */
		if (dp->dl_flock)
		setlease(filp, F_UNLCK, &dp->dl_flock);
		nfsd_close(filp);
		vfsclose++;
		@@ -1673,10 +1674,7 @@ nfs4_open_delegation(struct svc_fh fh, struct nfsd4_open open, struct nfs4_sta
		if ((status = setlease(stp->st_vfs_file,
		flag == NFS4_OPEN_DELEGATE_READ? F_RDLCK: F_WRLCK, &flp))) {
		dprintk("NFSD: setlease failed [%d], no delegation\n", status);
		list_del(&dp->dl_del_perfile);
		list_del(&dp->dl_del_perclnt);
		nfs4_put_delegation(dp);
		free_delegation++;
		unhash_delegation(dp);
		flag = NFS4_OPEN_DELEGATE_NONE;
		goto out;
		}

Admin message