summaryrefslogtreecommitdiff
path: root/crypto/ccm.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-03-17 20:34:30 +0100
committerThomas Gleixner <tglx@linutronix.de>2017-03-17 20:34:30 +0100
commitf64f1f8858052adbde6475a9c160e1acd5b0f0a7 (patch)
treef849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/ccm.c
parent080dd9646e870581657c76f8d1c0cd153fbdb962 (diff)
parent4c6427919ee920d5963cf826de76292286342aa0 (diff)
downloadlinux-crypto-f64f1f8858052adbde6475a9c160e1acd5b0f0a7.tar.gz
linux-crypto-f64f1f8858052adbde6475a9c160e1acd5b0f0a7.zip
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single UEFI fix from Ard: - Reduce the severity of the notice that appears when the ESRT table points to memory that is not covered by the memory map. It is scaring our users and interfering with their nice splash screens. Note that the ESRT may still be perfectly usable, and is currently (to my knowledge) not widely used to begin with.
Diffstat (limited to 'crypto/ccm.c')
-rw-r--r--crypto/ccm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 44284880..1ce37ae0 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -45,6 +45,7 @@ struct crypto_rfc4309_req_ctx {
struct crypto_ccm_req_priv_ctx {
u8 odata[16];
+ u8 idata[16];
u8 auth_tag[16];
u32 flags;
struct scatterlist src[3];
@@ -183,8 +184,8 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain,
AHASH_REQUEST_ON_STACK(ahreq, ctx->mac);
unsigned int assoclen = req->assoclen;
struct scatterlist sg[3];
- u8 odata[16];
- u8 idata[16];
+ u8 *odata = pctx->odata;
+ u8 *idata = pctx->idata;
int ilen, err;
/* format control data for input */