fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
authornixiaoming <nixiaoming@huawei.com>
Mon, 23 Jul 2018 01:57:11 +0000 (09:57 +0800)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 9 Aug 2018 20:11:21 +0000 (16:11 -0400)
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>
fs/nfsd/nfs4xdr.c

index fb49918..418fa9c 100644 (file)
@@ -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;