Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d48e82da authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Sasha Levin
Browse files

nfs4: start callback_ident at idr 1 



[ Upstream commit c68a027c05709330fe5b2f50c50d5fa02124b5d8 ]

If clp->cl_cb_ident is zero, then nfs_cb_idr_remove_locked() skips removing
it when the nfs_client is freed.  A decoding or server bug can then find
and try to put that first nfs_client which would lead to a crash.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Fixes: d6870312 ("nfs4client: convert to idr_alloc()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent e46b3f45

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static int nfs_get_cb_ident_idr(struct nfs_client *clp, int minorversion) 
		return ret;

	idr_preload(GFP_KERNEL);

	spin_lock(&nn->nfs_client_lock);

	ret = idr_alloc(&nn->cb_ident_idr, clp, 0, 0, GFP_NOWAIT);

	ret = idr_alloc(&nn->cb_ident_idr, clp, 1, 0, GFP_NOWAIT);

	if (ret >= 0)

		clp->cl_cb_ident = ret;

	spin_unlock(&nn->nfs_client_lock);