diff options
| author |   Vasily Averin <vvs@virtuozzo.com> | 2017-11-10 10:19:35 +0300 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2017-11-27 16:45:11 -0500 |
| commit | 2317dc557a3b6d5b73b697034611d658eb2cbde9 (patch) | |
| tree | 9854e4dff8bb6981a73aca72427187d3afea4d52 /fs/nfsd/nfsctl.c | |
| parent | race of lockd inetaddr notifiers vs nlmsvc_rqst change (diff) | |
| download | linux-dev-2317dc557a3b6d5b73b697034611d658eb2cbde9.tar.xz linux-dev-2317dc557a3b6d5b73b697034611d658eb2cbde9.zip | |
race of nfsd inetaddr notifiers vs nn->nfsd_serv change
nfsd_inet[6]addr_event uses nn->nfsd_serv without taking nfsd_mutex,
which can be changed during execution of notifiers and crash the host.
Moreover if notifiers were enabled in one net namespace they are enabled
in all other net namespaces, from creation until destruction.
This patch allows notifiers to access nn->nfsd_serv only after the
pointer is correctly initialized and delays cleanup until notifiers are
no longer in use.
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Tested-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 6493df6b1bd5..d107b4426f7e 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1241,6 +1241,9 @@ static __net_init int nfsd_init_net(struct net *net) nn->nfsd4_grace = 90; nn->clverifier_counter = prandom_u32(); nn->clientid_counter = prandom_u32(); + + atomic_set(&nn->ntf_refcnt, 0); + init_waitqueue_head(&nn->ntf_wq); return 0; out_idmap_error: |