diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2015-11-20 09:56:20 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 17:48:50 +0100 |
| commit | 90251c0cb6abec49c2e8fe5ad57916214e4da81d (patch) | |
| tree | e0c83aacaa97f2b93ee5c59ed7b02d66d0989102 | |
| parent | e0d495e250349701d7d3a7c91f84604d775e5923 (diff) | |
| download | linux-90251c0cb6abec49c2e8fe5ad57916214e4da81d.tar.gz linux-90251c0cb6abec49c2e8fe5ad57916214e4da81d.tar.bz2 linux-90251c0cb6abec49c2e8fe5ad57916214e4da81d.zip | |
nfs4: start callback_ident at idr 1
commit c68a027c05709330fe5b2f50c50d5fa02124b5d8 upstream.
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: Benjamin Coddington <bcodding@redhat.com>
Fixes: d6870312659d ("nfs4client: convert to idr_alloc()")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/nfs/nfs4client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 28e1f211600d..cf8b0a4794dd 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -32,7 +32,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); |