diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2014-07-30 21:26:05 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-05 16:34:18 -0700 |
| commit | d29135ddc8f0c3084693d6770c412f3b3b94a1c0 (patch) | |
| tree | 29e43cbcdf5dd53079c8139b7080b17c300f96e3 /fs/nfsd | |
| parent | 323308e6f5ea6e0fa311478581c87b09fa219f9c (diff) | |
| download | linux-stable-d29135ddc8f0c3084693d6770c412f3b3b94a1c0.tar.gz linux-stable-d29135ddc8f0c3084693d6770c412f3b3b94a1c0.tar.bz2 linux-stable-d29135ddc8f0c3084693d6770c412f3b3b94a1c0.zip | |
NFSD: Decrease nfsd_users in nfsd_startup_generic fail
commit d9499a95716db0d4bc9b67e88fd162133e7d6b08 upstream.
A memory allocation failure could cause nfsd_startup_generic to fail, in
which case nfsd_users wouldn't be incorrectly left elevated.
After nfsd restarts nfsd_startup_generic will then succeed without doing
anything--the first consequence is likely nfs4_start_net finding a bad
laundry_wq and crashing.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Fixes: 4539f14981ce "nfsd: replace boolean nfsd_up flag by users counter"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfssvc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 9a4a5f9e7468..c34e45d1539b 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -221,7 +221,8 @@ static int nfsd_startup_generic(int nrservs) */ ret = nfsd_racache_init(2*nrservs); if (ret) - return ret; + goto dec_users; + ret = nfs4_state_start(); if (ret) goto out_racache; @@ -229,6 +230,8 @@ static int nfsd_startup_generic(int nrservs) out_racache: nfsd_racache_shutdown(); +dec_users: + nfsd_users--; return ret; } |