Re: [PATCH 1/3] crypto: Fix potential leak in test_aead_speed() if aad_size is too big

[Tim Chen <tim.c.chen@linux.intel.com>]

On Mon, 2014-04-21 at 20:45 +0200, Christian Engelmayer wrote:
> Fix a potential memory leak in the error handling of test_aead_speed(). In case
> the size check on the associate data length parameter fails, the function goes
> through the wrong exit label. Reported by Coverity - CID 1163870.
> 
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>

Acked.

Tim

> ---
>  crypto/tcrypt.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
> index 870be7b..1856d7f 100644
> --- a/crypto/tcrypt.c
> +++ b/crypto/tcrypt.c
> @@ -282,6 +282,11 @@ static void test_aead_speed(const char *algo, int enc, unsigned int sec,
>  	unsigned int *b_size;
>  	unsigned int iv_len;
>  
> +	if (aad_size >= PAGE_SIZE) {
> +		pr_err("associate data length (%u) too big\n", aad_size);
> +		return;
> +	}
> +
>  	if (enc == ENCRYPT)
>  		e = "encryption";
>  	else
> @@ -323,14 +328,7 @@ static void test_aead_speed(const char *algo, int enc, unsigned int sec,
>  		b_size = aead_sizes;
>  		do {
>  			assoc = axbuf[0];
> -
> -			if (aad_size < PAGE_SIZE)
> -				memset(assoc, 0xff, aad_size);
> -			else {
> -				pr_err("associate data length (%u) too big\n",
> -					aad_size);
> -				goto out_nosg;
> -			}
> +			memset(assoc, 0xff, aad_size);
>  			sg_init_one(&asg[0], assoc, aad_size);
>  
>  			if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {