diff options
| author | Gary R Hook <gary.hook@amd.com> | 2019-07-30 16:05:22 +0000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-08-02 14:36:29 +1000 |
| commit | 25e44338321af545ab34243a6081c3f0fc6107d0 (patch) | |
| tree | 9517547e8177a815c50fca353b6f8bed99a290aa /drivers/crypto/ccp | |
| parent | cf144f81a99d1a3928f90b0936accfd3f45c9a0a (diff) | |
| download | linux-stable-25e44338321af545ab34243a6081c3f0fc6107d0.tar.gz linux-stable-25e44338321af545ab34243a6081c3f0fc6107d0.tar.bz2 linux-stable-25e44338321af545ab34243a6081c3f0fc6107d0.zip | |
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: 36cf515b9bbe2 ("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>
Diffstat (limited to 'drivers/crypto/ccp')
| -rw-r--r-- | drivers/crypto/ccp/ccp-ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c index 3ebe031773d5..59f9849c3662 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -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: |