diff options
| author | nixiaoming <nixiaoming@huawei.com> | 2018-07-23 09:57:11 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-08-09 16:11:21 -0400 |
| commit | 5ed96bc5451bb736a0b7d5d72a0f444316dc6559 (patch) | |
| tree | 76b5f00d93ac697f8dd8a8f46ff1b453a80913f4 /fs/nfsd | |
| parent | 11b4d66ea3313d9b03a83b80458ddee64990e3c3 (diff) | |
| download | linux-5ed96bc5451bb736a0b7d5d72a0f444316dc6559.tar.bz2 | |
fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
READ_BUF(8);
dummy = be32_to_cpup(p++);
dummy = be32_to_cpup(p++);
...
READ_BUF(4);
dummy = be32_to_cpup(p++);
Assigning value to "dummy" here, but that stored value
is overwritten before it can be used.
At the same time READ_BUF() will re-update the pointer p.
delete invalid assignment statements
Signed-off-by: nixiaoming <nixiaoming@huawei.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trondmy@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index fb4991889f89..418fa9c78186 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1390,10 +1390,8 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp, p += XDR_QUADLEN(dummy); } - /* ssp_window and ssp_num_gss_handles */ + /* ignore ssp_window and ssp_num_gss_handles: */ READ_BUF(8); - dummy = be32_to_cpup(p++); - dummy = be32_to_cpup(p++); break; default: goto xdr_error; |