Skip to content

Commit 9a81cde

Browse files
Li Lingfenggregkh
authored andcommitted
nfsd: put dl_stid if fail to queue dl_recall
commit 230ca75 upstream. Before calling nfsd4_run_cb to queue dl_recall to the callback_wq, we increment the reference count of dl_stid. We expect that after the corresponding work_struct is processed, the reference count of dl_stid will be decremented through the callback function nfsd4_cb_recall_release. However, if the call to nfsd4_run_cb fails, the incremented reference count of dl_stid will not be decremented correspondingly, leading to the following nfs4_stid leak: unreferenced object 0xffff88812067b578 (size 344): comm "nfsd", pid 2761, jiffies 4295044002 (age 5541.241s) hex dump (first 32 bytes): 01 00 00 00 6b 6b 6b 6b b8 02 c0 e2 81 88 ff ff ....kkkk........ 00 6b 6b 6b 6b 6b 6b 6b 00 00 00 00 ad 4e ad de .kkkkkkk.....N.. backtrace: kmem_cache_alloc+0x4b9/0x700 nfsd4_process_open1+0x34/0x300 nfsd4_open+0x2d1/0x9d0 nfsd4_proc_compound+0x7a2/0xe30 nfsd_dispatch+0x241/0x3e0 svc_process_common+0x5d3/0xcc0 svc_process+0x2a3/0x320 nfsd+0x180/0x2e0 kthread+0x199/0x1d0 ret_from_fork+0x30/0x50 ret_from_fork_asm+0x1b/0x30 unreferenced object 0xffff8881499f4d28 (size 368): comm "nfsd", pid 2761, jiffies 4295044005 (age 5541.239s) hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 30 4d 9f 49 81 88 ff ff ........0M.I.... 30 4d 9f 49 81 88 ff ff 20 00 00 00 01 00 00 00 0M.I.... ....... backtrace: kmem_cache_alloc+0x4b9/0x700 nfs4_alloc_stid+0x29/0x210 alloc_init_deleg+0x92/0x2e0 nfs4_set_delegation+0x284/0xc00 nfs4_open_delegation+0x216/0x3f0 nfsd4_process_open2+0x2b3/0xee0 nfsd4_open+0x770/0x9d0 nfsd4_proc_compound+0x7a2/0xe30 nfsd_dispatch+0x241/0x3e0 svc_process_common+0x5d3/0xcc0 svc_process+0x2a3/0x320 nfsd+0x180/0x2e0 kthread+0x199/0x1d0 ret_from_fork+0x30/0x50 ret_from_fork_asm+0x1b/0x30 Fix it by checking the result of nfsd4_run_cb and call nfs4_put_stid if fail to queue dl_recall. Cc: stable@vger.kernel.org Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 15483af commit 9a81cde

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

fs/nfsd/nfs4state.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,12 @@ static struct nfs4_ol_stateid * nfs4_alloc_open_stateid(struct nfs4_client *clp)
10661066
return openlockstateid(stid);
10671067
}
10681068

1069+
/*
1070+
* As the sc_free callback of deleg, this may be called by nfs4_put_stid
1071+
* in nfsd_break_one_deleg.
1072+
* Considering nfsd_break_one_deleg is called with the flc->flc_lock held,
1073+
* this function mustn't ever sleep.
1074+
*/
10691075
static void nfs4_free_deleg(struct nfs4_stid *stid)
10701076
{
10711077
struct nfs4_delegation *dp = delegstateid(stid);
@@ -4920,6 +4926,7 @@ static const struct nfsd4_callback_ops nfsd4_cb_recall_ops = {
49204926

49214927
static void nfsd_break_one_deleg(struct nfs4_delegation *dp)
49224928
{
4929+
bool queued;
49234930
/*
49244931
* We're assuming the state code never drops its reference
49254932
* without first removing the lease. Since we're in this lease
@@ -4928,7 +4935,10 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp)
49284935
* we know it's safe to take a reference.
49294936
*/
49304937
refcount_inc(&dp->dl_stid.sc_count);
4931-
WARN_ON_ONCE(!nfsd4_run_cb(&dp->dl_recall));
4938+
queued = nfsd4_run_cb(&dp->dl_recall);
4939+
WARN_ON_ONCE(!queued);
4940+
if (!queued)
4941+
nfs4_put_stid(&dp->dl_stid);
49324942
}
49334943

49344944
/* Called from break_lease() with flc_lock held. */

0 commit comments

Comments
 (0)