redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

crypto: ccp - Fix oops by properly managing allocated structures 

A plaintext or ciphertext length of 0 is allowed in AES, in which case
no encryption occurs. Ensure that we don't clean up data structures
that were never allocated.

Fixes: 36cf515b9b ("crypto: ccp - Enable support for AES GCM on v5 CCPs")
Cc: <stable@vger.kernel.org>
Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
alistair/sunxi64-5.4-dsi
Gary R Hook 2019-07-30 16:05:22 +00:00 committed by Herbert Xu
parent cf144f81a9
commit 25e4433832
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/ccp/ccp-ops.c
View File

@ -859,11 +859,11 @@ e_tag:
ccp_dm_free(&final_wa);
e_dst:
if (aes->src_len && !in_place)
if (ilen > 0 && !in_place)
ccp_free_data(&dst, cmd_q);
e_src:
if (aes->src_len)
if (ilen > 0)
ccp_free_data(&src, cmd_q);
e_aad: