Re: [PATCH v2] fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
From: J. Bruce Fields
Date: Wed Aug 01 2018 - 11:18:23 EST
On Mon, Jul 23, 2018 at 09:57:11AM +0800, nixiaoming wrote:
> 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
Thanks, applying with a minor comment tweak to clarify that we're
intentionally not reading these:
- /* ssp_window and ssp_num_gss_handles */
+ /* ignore ssp_window and ssp_num_gss_handles: */
READ_BUF(8);
break;
--b.
>
> Signed-off-by: nixiaoming <nixiaoming@xxxxxxxxxx>
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> Signed-off-by: Trond Myklebust <trondmy@xxxxxxxxxxxxxxx>
> ---
> fs/nfsd/nfs4xdr.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index a96843c..375ad4b 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -1392,8 +1392,6 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
>
> /* 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;
> --
> 2.10.1