diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-18 21:11:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-18 21:11:13 +0300 |
| commit | 15b0a8d1d45a116cbd03d41fd066285ac8ecd3b4 (patch) | |
| tree | f6acd2cdbf24ab8cc0ff891e87eb249f88289214 | |
| parent | cb8c65ccff7f77d0285f1b126c72d37b2572c865 (diff) | |
| parent | eff793687792d3eed594d147aceef2000fb9ca3d (diff) | |
| download | linux-15b0a8d1d45a116cbd03d41fd066285ac8ecd3b4.tar.xz | |
Merge tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux
Pull nfsd fix from Bruce Fields:
"One fix for a problem introduced in the most recent merge window and
found by Dave Jones and KASAN"
* tag 'nfsd-4.13-1' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix a memory scribble in the callback channel
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index b45083c0f9ae..49b0a9e7ff18 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -720,8 +720,8 @@ static const struct rpc_version nfs_cb_version4 = { .counts = nfs4_cb_counts, }; -static const struct rpc_version *nfs_cb_version[] = { - &nfs_cb_version4, +static const struct rpc_version *nfs_cb_version[2] = { + [1] = &nfs_cb_version4, }; static const struct rpc_program cb_program; @@ -795,7 +795,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c .saddress = (struct sockaddr *) &conn->cb_saddr, .timeout = &timeparms, .program = &cb_program, - .version = 0, + .version = 1, .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET), }; struct rpc_clnt *client; |