Skip to content

Commit 88956ea

Browse files
neilbrownchucklever
authored andcommitted
NFSD: fix possible oops when nfsd/pool_stats is closed.
If /proc/fs/nfsd/pool_stats is open when the last nfsd thread exits, then when the file is closed a NULL pointer is dereferenced. This is because nfsd_pool_stats_release() assumes that the pointer to the svc_serv cannot become NULL while a reference is held. This used to be the case but a recent patch split nfsd_last_thread() out from nfsd_put(), and clearing the pointer is done in nfsd_last_thread(). This is easily reproduced by running rpc.nfsd 8 ; ( rpc.nfsd 0;true) < /proc/fs/nfsd/pool_stats Fortunately nfsd_pool_stats_release() has easy access to the svc_serv pointer, and so can call svc_put() on it directly. Fixes: 9f28a97 ("nfsd: separate nfsd_last_thread() from nfsd_put()") Signed-off-by: NeilBrown <neilb@suse.de> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent fdd2630 commit 88956ea

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/nfsd/nfssvc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,11 +1082,12 @@ int nfsd_pool_stats_open(struct inode *inode, struct file *file)
10821082

10831083
int nfsd_pool_stats_release(struct inode *inode, struct file *file)
10841084
{
1085+
struct seq_file *seq = file->private_data;
1086+
struct svc_serv *serv = seq->private;
10851087
int ret = seq_release(inode, file);
1086-
struct net *net = inode->i_sb->s_fs_info;
10871088

10881089
mutex_lock(&nfsd_mutex);
1089-
nfsd_put(net);
1090+
svc_put(serv);
10901091
mutex_unlock(&nfsd_mutex);
10911092
return ret;
10921093
}

0 commit comments

Comments
 (0)