NFS: Fix uninitialized rpc_wait_queue (68ebf8fe) · Commits · 戴 / test

Michael Sterrett reports a NULL pointer dereference on NFSv3 mounts when CONFIG_NFS_V4 is not set because the NFS UOC rpc_wait_queue has not been initialized. Move the initialization of the queue out of the CONFIG_NFS_V4 conditional setion. Fixes: ("NFS: Add an iocounter wait function for async RPC tasks") Cc: stable@vger.kernel.org # 4.11+ Signed-off-by:

Benjamin Coddington <bcodding@redhat.com> Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/client.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,6 @@ static void nfs_cb_idr_remove_locked(struct nfs_client *clp)
	static void pnfs_init_server(struct nfs_server *server)		static void pnfs_init_server(struct nfs_server *server)
	{		{
	rpc_init_wait_queue(&server->roc_rpcwaitq, "pNFS ROC");		rpc_init_wait_queue(&server->roc_rpcwaitq, "pNFS ROC");
	rpc_init_wait_queue(&server->uoc_rpcwaitq, "NFS UOC");
	}		}

	#else		#else
	@@ -888,6 +887,7 @@ struct nfs_server *nfs_alloc_server(void)
	ida_init(&server->openowner_id);		ida_init(&server->openowner_id);
	ida_init(&server->lockowner_id);		ida_init(&server->lockowner_id);
	pnfs_init_server(server);		pnfs_init_server(server);
			rpc_init_wait_queue(&server->uoc_rpcwaitq, "NFS UOC");

	return server;		return server;
	}		}

Admin message