Skip to content

Commit

Permalink
crypto: aesni-intel - Fix remaining leak in rfc4106_set_hash_key
Browse files Browse the repository at this point in the history
Fix up previous patch that failed to properly fix mem leak in 
rfc4106_set_hash_subkey(). This add-on patch; fixes the leak. moves 
kfree() out of the error path, returns -ENOMEM rather than -EINVAL when 
ablkcipher_request_alloc() fails.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Jesper Juhl authored and Herbert Xu committed Feb 16, 2011
1 parent 36be070 commit fc9044e
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions arch/x86/crypto/aesni-intel_glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -874,19 +874,17 @@ rfc4106_set_hash_subkey(u8 *hash_subkey, const u8 *key, unsigned int key_len)

ret = crypto_ablkcipher_setkey(ctr_tfm, key, key_len);
if (ret)
goto out;
goto out_free_ablkcipher;

ret = -ENOMEM;
req = ablkcipher_request_alloc(ctr_tfm, GFP_KERNEL);
if (!req) {
ret = -EINVAL;
if (!req)
goto out_free_ablkcipher;
}

req_data = kmalloc(sizeof(*req_data), GFP_KERNEL);
if (!req_data) {
ret = -ENOMEM;
if (!req_data)
goto out_free_request;
}

memset(req_data->iv, 0, sizeof(req_data->iv));

/* Clear the data in the hash sub key container to zero.*/
Expand All @@ -911,12 +909,11 @@ rfc4106_set_hash_subkey(u8 *hash_subkey, const u8 *key, unsigned int key_len)
if (!ret)
ret = req_data->result.err;
}
kfree(req_data);
out_free_request:
ablkcipher_request_free(req);
kfree(req_data);
out_free_ablkcipher:
crypto_free_ablkcipher(ctr_tfm);
out:
return ret;
}

Expand Down

0 comments on commit fc9044e

Please sign in to comment.