nfsd4: fix leak of inode reference on delegation failure
Subsystems (2)
PATCH 1/1 nfsd4: fix leak of inode reference on delegation failure
From: "J. Bruce Fields" <[email protected]>
commit bf7bd3e98be5c74813bee6ad496139fb0a011b3b upstream, for >= 3.10.
This fixes a regression from 68a3396178e6688ad7367202cdf0af8ed03c8727 "nfsd4: shut down more of delegation earlier".
After that commit, nfs4_set_delegation() failures result in nfs4_put_delegation being called, but nfs4_put_delegation doesn't free the nfs4_file that has already been set by alloc_init_deleg().
This can result in an oops on later unmounting the exported filesystem.
Note also delaying the fi_had_conflict check we're able to return a better error (hence give 4.1 clients a better idea why the delegation failed; though note CONFLICT isn't an exact match here, as that's supposed to indicate a current conflict, but all we know here is that there was one recently).
--- fs/nfsd/nfs4state.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
fs/nfsd/nfs4state.c +20 -11
@@ -368,11 +368,8 @@ static struct nfs4_delegation * alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svc_fh *current_fh) { struct nfs4_delegation *dp; -struct nfs4_file *fp = stp->st_file;dprintk ("NFSD alloc_init_deleg\n" ); -if (fp->fi_had_conflict) -return NULL ;if (num_delegations > max_delegations)return NULL ; dp =delegstateid (nfs4_alloc_stid (clp, deleg_slab));
@@ -389,8 +386,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svINIT_LIST_HEAD (&dp->dl_perfile);INIT_LIST_HEAD (&dp->dl_perclnt);INIT_LIST_HEAD (&dp->dl_recall_lru); -get_nfs4_file (fp); - dp->dl_file = fp; + dp->dl_file =NULL ; dp->dl_type =NFS4_OPEN_DELEGATE_READ ;fh_copy_shallow (&dp->dl_fh, ¤t_fh->fh_handle); dp->dl_time =0 ;
@@ -3044,22 +3040,35 @@ static int nfs4_setlease(struct nfs4_delegation *dp)return 0 ; } -static int nfs4_set_delegation (struct nfs4_delegation *dp) +static int nfs4_set_delegation (struct nfs4_delegation *dp,struct nfs4_file *fp) { -struct nfs4_file *fp = dp->dl_file; +int status; -if (!fp->fi_lease) -return nfs4_setlease (dp); +if (fp->fi_had_conflict) +return -EAGAIN ; +get_nfs4_file (fp); + dp->dl_file = fp; +if (!fp->fi_lease) { + status =nfs4_setlease (dp); +if (status) + goto out_free; +return 0 ; + }spin_lock (&recall_lock);if (fp->fi_had_conflict) {spin_unlock (&recall_lock); -return -EAGAIN ; + status = -EAGAIN ; + goto out_free; }atomic_inc (&fp->fi_delegees);list_add (&dp->dl_perfile, &fp->fi_delegations);spin_unlock (&recall_lock);list_add (&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations);return 0 ; +out_free: +put_nfs4_file (fp); + dp->dl_file = fp; +return status; }static void nfsd4_open_deleg_none_ext (struct nfsd4_open *open,int status)
@@ -3134,7 +3143,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, dp =alloc_init_deleg (oo->oo_owner.so_client, stp, fh);if (dp ==NULL ) goto out_no_deleg; - status =nfs4_set_delegation (dp); + status =nfs4_set_delegation (dp, stp->st_file);if (status) goto out_free;
Signature · 1 line
1.7.9.5
Whoops, apologies, this requires a little fixing up to backport. Ignore for now.
--b.
Quoted 105 lines · bfields
From: "J. Bruce Fields" <[email protected]>
commit
bf7bd3e98be5c74813bee6ad496139fb0a011b3bupstream, for >= 3.10.This fixes a regression from
68a3396178e6688ad7367202cdf0af8ed03c8727"nfsd4: shut down more of delegation earlier".After that commit,
nfs4_set_delegation()failures result innfs4_put_delegationbeing called, butnfs4_put_delegationdoesn't free thenfs4_filethat has already been set byalloc_init_deleg().This can result in an oops on later unmounting the exported filesystem.
Note also delaying the
fi_had_conflictcheck we're able to return a better error (hence give 4.1 clients a better idea why the delegation failed; though note CONFLICT isn't an exact match here, as that's supposed to indicate a current conflict, but all we know here is that there was one recently).Reported-by Toralf Förster <[email protected]>Tested-by Toralf Förster <[email protected]>Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfsd/nfs4state.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)fs/nfsd/nfs4state.c +20
-11@@ -368,11 +368,8 @@ static struct nfs4_delegation * alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svc_fh *current_fh) { struct nfs4_delegation *dp; -struct nfs4_file *fp = stp->st_file;dprintk ("NFSD alloc_init_deleg\n" ); -if (fp->fi_had_conflict) -return NULL ;if (num_delegations > max_delegations)return NULL ; dp =delegstateid (nfs4_alloc_stid (clp, deleg_slab));@@ -389,8 +386,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct svINIT_LIST_HEAD (&dp->dl_perfile);INIT_LIST_HEAD (&dp->dl_perclnt);INIT_LIST_HEAD (&dp->dl_recall_lru); -get_nfs4_file (fp); - dp->dl_file = fp; + dp->dl_file =NULL ; dp->dl_type =NFS4_OPEN_DELEGATE_READ ;fh_copy_shallow (&dp->dl_fh, ¤t_fh->fh_handle); dp->dl_time =0 ;@@ -3044,22 +3040,35 @@ static int nfs4_setlease(struct nfs4_delegation *dp)return 0 ; } -static int nfs4_set_delegation (struct nfs4_delegation *dp) +static int nfs4_set_delegation (struct nfs4_delegation *dp,struct nfs4_file *fp) { -struct nfs4_file *fp = dp->dl_file; +int status; -if (!fp->fi_lease) -return nfs4_setlease (dp); +if (fp->fi_had_conflict) +return -EAGAIN ; +get_nfs4_file (fp); + dp->dl_file = fp; +if (!fp->fi_lease) { + status =nfs4_setlease (dp); +if (status) + goto out_free; +return 0 ; + }spin_lock (&recall_lock);if (fp->fi_had_conflict) {spin_unlock (&recall_lock); -return -EAGAIN ; + status = -EAGAIN ; + goto out_free; }atomic_inc (&fp->fi_delegees);list_add (&dp->dl_perfile, &fp->fi_delegations);spin_unlock (&recall_lock);list_add (&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations);return 0 ; +out_free: +put_nfs4_file (fp); + dp->dl_file = fp; +return status; }static void nfsd4_open_deleg_none_ext (struct nfsd4_open *open,int status)@@ -3134,7 +3143,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, dp =alloc_init_deleg (oo->oo_owner.so_client, stp, fh);if (dp ==NULL ) goto out_no_deleg; - status =nfs4_set_delegation (dp); + status =nfs4_set_delegation (dp, stp->st_file);if (status) goto out_free;Signature · 1 line
1.7.9.5
Quoted 2 lines · J. Bruce Fields
Whoops, apologies, this requires a little fixing up to backport. Ignore for now.
Even for 3.11? It seems to build there just fine.
thanks,
greg k-h
Quoted 5 lines · Greg KH
Quoted 2 lines · J. Bruce Fields
Whoops, apologies, this requires a little fixing up to backport. Ignore for now.
Even for 3.11? It seems to build there just fine.
Please do apply for 3.11, thanks for noticing that.
Then if/when this gets backported to 3.10 we'll send that separately.
Apologies for the confusion.
--b.
Quoted 3 lines · J. Bruce Fields
From: "J. Bruce Fields" <[email protected]>
commit
bf7bd3e98be5c74813bee6ad496139fb0a011b3bupstream, for >= 3.10.
This doesn't apply at all to 3.10, but does to 3.11. If you want it in 3.10, can you provide a backport that works?
thanks,
greg k-h