nfsd: Initialize ssc before laundromat_work to prevent NULL dereference
Subsystems (2)
PATCH 1/1 nfsd: Initialize ssc before laundromat_work to prevent NULL dereference
In nfs4_state_start_net(), laundromat_work may access nfsd_ssc through nfs4_laundromat -> nfsd4_ssc_expire_umount. If nfsd_ssc isn't initialized, this can cause NULL pointer dereference.
Normally the delayed start of laundromat_work allows sufficient time for nfsd_ssc initialization to complete. However, when the kernel waits too long for userspace responses (e.g. in nfs4_state_start_net -> nfsd4_end_grace -> nfsd4_record_grace_done -> nfsd4_cld_grace_done -> cld_pipe_upcall -> __cld_pipe_upcall -> wait_for_completion path), the delayed work may start before nfsd_ssc initialization finishes.
Fix this by moving nfsd_ssc initialization before starting laundromat_work.
--- fs/nfsd/nfssvc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/nfssvc.c +3 -3
@@ -396,13 +396,13 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)if (ret) goto out_filecache; +#ifdef CONFIG_NFSD_V4_2_INTER_SSC +nfsd4_ssc_init_umount_work (nn); +#endif ret =nfs4_state_start_net (net);if (ret) goto out_reply_cache; -#ifdef CONFIG_NFSD_V4_2_INTER_SSC -nfsd4_ssc_init_umount_work (nn); -#endif nn->nfsd_net_up = true;return 0 ;
Signature · 1 line
2.31.1
[email protected]
maintainerFrom: Chuck Lever <[email protected]>
Quoted 4 lines · Li Lingfeng
In
nfs4_state_start_net(),laundromat_workmay accessnfsd_sscthroughnfs4_laundromat->nfsd4_ssc_expire_umount. Ifnfsd_sscisn't initialized, this can cause NULL pointer dereference.
Quoted 8 lines
Normally the delayed start of
laundromat_workallows sufficient time fornfsd_sscinitialization to complete. However, when the kernel waits too long for userspace responses (e.g. innfs4_state_start_net->nfsd4_end_grace->nfsd4_record_grace_done->nfsd4_cld_grace_done->cld_pipe_upcall->__cld_pipe_upcall->wait_for_completionpath), the delayed work may start beforenfsd_sscinitialization finishes.[...]
Applied to nfsd-testing, thanks!
[1/1] nfsd: Initialize ssc before laundromat_work to prevent NULL dereference
commit: 05d68df60b9af7765c38073ff117169aa5f52310
--
Chuck Lever
Quoted 30 lines · Li Lingfeng
In
nfs4_state_start_net(),laundromat_workmay accessnfsd_sscthroughnfs4_laundromat->nfsd4_ssc_expire_umount. Ifnfsd_sscisn't initialized, this can cause NULL pointer dereference.Normally the delayed start of
laundromat_workallows sufficient time fornfsd_sscinitialization to complete. However, when the kernel waits too long for userspace responses (e.g. innfs4_state_start_net->nfsd4_end_grace->nfsd4_record_grace_done->nfsd4_cld_grace_done->cld_pipe_upcall->__cld_pipe_upcall->wait_for_completionpath), the delayed work may start beforenfsd_sscinitialization finishes.Fix this by moving
nfsd_sscinitialization before startinglaundromat_work.Fixes f4e44b393389 ("NFSD: delay unmount source's export after inter-server copy completed.")Signed-off-by Li Lingfeng <[email protected]>--- fs/nfsd/nfssvc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/nfsd/nfssvc.c +3
-0@@ -396,13 +396,13 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred)if (ret) goto out_filecache; +#ifdef CONFIG_NFSD_V4_2_INTER_SSC +nfsd4_ssc_init_umount_work (nn); +#endif
fs/nfsd/nfssvc.c static int nfsd_startup_net(struct net *net, const struct cred *cred) · line 408
Quoted 10 lines
fs/nfsd/nfssvc.c +0
-3ret =nfs4_state_start_net (net);if (ret) goto out_reply_cache; -#ifdef CONFIG_NFSD_V4_2_INTER_SSC -nfsd4_ssc_init_umount_work (nn); -#endif nn->nfsd_net_up = true;return 0 ;