diff options
| author | Cfir Cohen <cfir@google.com> | 2019-07-02 10:32:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:10:50 +0200 |
| commit | b9796d1ce2a8ab32533f6a3c74c996dc1eef30c6 (patch) | |
| tree | 8819d9cedeba733ab92495075aeba8c359ca9ec1 /drivers/crypto | |
| parent | 1ad6d2f0e22c39eca086c994f7d03739fd030f7d (diff) | |
| download | linux-stable-b9796d1ce2a8ab32533f6a3c74c996dc1eef30c6.tar.gz linux-stable-b9796d1ce2a8ab32533f6a3c74c996dc1eef30c6.tar.bz2 linux-stable-b9796d1ce2a8ab32533f6a3c74c996dc1eef30c6.zip | |
crypto: ccp/gcm - use const time tag comparison.
commit 538a5a072e6ef04377b180ee9b3ce5bae0a85da4 upstream.
Avoid leaking GCM tag through timing side channel.
Fixes: 36cf515b9bbe ("crypto: ccp - Enable support for AES GCM on v5 CCPs")
Cc: <stable@vger.kernel.org> # v4.12+
Signed-off-by: Cfir Cohen <cfir@google.com>
Acked-by: Gary R Hook <ghook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/ccp/ccp-ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c index 6f1094dd12ce..1cbdfc08ca00 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -850,7 +850,8 @@ static int ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, if (ret) goto e_tag; - ret = memcmp(tag.address, final_wa.address, AES_BLOCK_SIZE); + ret = crypto_memneq(tag.address, final_wa.address, + AES_BLOCK_SIZE) ? -EBADMSG : 0; ccp_dm_free(&tag); } |