]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Revert "nfsd: fix oops when reading pool_stats before server is started"
authorNeilBrown <neilb@suse.de>
Mon, 24 Jun 2024 23:04:57 +0000 (09:04 +1000)
committerChuck Lever <chuck.lever@oracle.com>
Tue, 25 Jun 2024 14:18:05 +0000 (10:18 -0400)
commitac03629b1612ad008ea6603a3d142e291e3de9bb
treeaa201fda629b905dca4ca2efac65f3a16b8dbb32
parente0011bca603c101f2a3c007bdb77f7006fa78fb1
Revert "nfsd: fix oops when reading pool_stats before server is started"

This reverts commit 8e948c365d9c10b685d1deb946bd833d6a9b43e0.

The reverted commit moves a test on a field protected by a mutex outside
of the protection of that mutex, and so is obviously racey.

Depending on how the race goes, si->serv might be NULL when dereferenced
in svc_pool_stats_start(), or svc_pool_stats_stop() might unlock a mutex
that hadn't been locked.

This bug that the commit tried to fix has been addressed by initialising
->mutex earlier.

Fixes: 8e948c365d9c ("nfsd: fix oops when reading pool_stats before server is started")
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
net/sunrpc/svc_xprt.c