[v2] fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
diff mbox series

Message ID 20180723015711.27961-1-nixiaoming@huawei.com
State New
Headers show
Series
  • [v2] fs/nfsd: Delete invalid assignment statements in nfsd4_decode_exchange_id
Related show

Commit Message

Xiaoming Ni July 23, 2018, 1:57 a.m. UTC
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>
---
 fs/nfsd/nfs4xdr.c | 2 --
 1 file changed, 2 deletions(-)

Comments

J. Bruce Fields Aug. 1, 2018, 3:18 p.m. UTC | #1
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@huawei.com>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Trond Myklebust <trondmy@hammerspace.com>
> ---
>  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
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Xiaoming Ni Aug. 2, 2018, 1 p.m. UTC | #2
On Wednesday, August 01, 2018 11:18 PM ,  J. Bruce Fields  wrote: 
>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.
>

Thanks for your advice
I will update the patch as soon as possible according to your advice.

>> 
>> Signed-off-by: nixiaoming <nixiaoming@huawei.com>
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>2
>> Signed-off-by: Trond Myklebust <trondmy@hammerspace.com>
>> ---
>>  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



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
J. Bruce Fields Aug. 2, 2018, 1:19 p.m. UTC | #3
On Thu, Aug 02, 2018 at 01:00:26PM +0000, Nixiaoming wrote:
> On Wednesday, August 01, 2018 11:18 PM ,  J. Bruce Fields  wrote: 
> >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.
> >
> 
> Thanks for your advice
> I will update the patch as soon as possible according to your advice.

I've taken care of it, no need to update.

--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox series

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;