NFS: Fix a race in __nfs_list_for_each_server()

commit 9c07b75b80eeff714420fb6a4c880b284e529d0f upstream.

The struct nfs_server gets put on the cl_superblocks list before
the server->super field has been initialised, in which case the
call to nfs_sb_active() will Oops. Add a check to ensure that
we skip such a list entry.

Fixes: 3c9e502b59fb ("NFS: Add a helper nfs_client_for_each_server()")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Trond Myklebust 2020-04-30 15:08:26 -04:00 committed by Greg Kroah-Hartman
parent f0ea421fa2
commit b5c3bc4b81

View File

@ -445,7 +445,7 @@ static int __nfs_list_for_each_server(struct list_head *head,
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(server, head, client_link) { list_for_each_entry_rcu(server, head, client_link) {
if (!nfs_sb_active(server->super)) if (!(server->super && nfs_sb_active(server->super)))
continue; continue;
rcu_read_unlock(); rcu_read_unlock();
if (last) if (last)