Re: [PATCH] SUNRPC: Refactor gssx_dec_option_array() to killuninitialized warning

[J. Bruce Fields]

On Mon, May 06, 2013 at 09:21:03AM +0200, Geert Uytterhoeven wrote:
> net/sunrpc/auth_gss/gss_rpc_xdr.c: In function âgssx_dec_option_arrayâ:
> net/sunrpc/auth_gss/gss_rpc_xdr.c:258: warning: âcredsâ may be used uninitialized in this function
> 
> Return early if count is zero, to make it clearer to the compiler (and the
> casual reviewer) that no more processing is done.

Looks reasonable; applying for 3.10.--b.

> 
> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> ---
>  net/sunrpc/auth_gss/gss_rpc_xdr.c |   32 +++++++++++++++++---------------
>  1 files changed, 17 insertions(+), 15 deletions(-)
> 
> diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
> index 5c4c61d..a1e1b1a 100644
> --- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
> +++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
> @@ -264,25 +264,27 @@ static int gssx_dec_option_array(struct xdr_stream *xdr,
>  	if (unlikely(p == NULL))
>  		return -ENOSPC;
>  	count = be32_to_cpup(p++);
> -	if (count != 0) {
> -		/* we recognize only 1 currently: CREDS_VALUE */
> -		oa->count = 1;
> +	if (!count)
> +		return 0;
>  
> -		oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
> -		if (!oa->data)
> -			return -ENOMEM;
> +	/* we recognize only 1 currently: CREDS_VALUE */
> +	oa->count = 1;
>  
> -		creds = kmalloc(sizeof(struct svc_cred), GFP_KERNEL);
> -		if (!creds) {
> -			kfree(oa->data);
> -			return -ENOMEM;
> -		}
> +	oa->data = kmalloc(sizeof(struct gssx_option), GFP_KERNEL);
> +	if (!oa->data)
> +		return -ENOMEM;
>  
> -		oa->data[0].option.data = CREDS_VALUE;
> -		oa->data[0].option.len = sizeof(CREDS_VALUE);
> -		oa->data[0].value.data = (void *)creds;
> -		oa->data[0].value.len = 0;
> +	creds = kmalloc(sizeof(struct svc_cred), GFP_KERNEL);
> +	if (!creds) {
> +		kfree(oa->data);
> +		return -ENOMEM;
>  	}
> +
> +	oa->data[0].option.data = CREDS_VALUE;
> +	oa->data[0].option.len = sizeof(CREDS_VALUE);
> +	oa->data[0].value.data = (void *)creds;
> +	oa->data[0].value.len = 0;
> +
>  	for (i = 0; i < count; i++) {
>  		gssx_buffer dummy = { 0, NULL };
>  		u32 length;
> -- 
> 1.7.0.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/