diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
commit | dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c (patch) | |
tree | 9d316a6f7ed462d132786f074da835b8ff1f7196 /crypto/hmac.c | |
parent | 8dab4355510edce56ef3bb8e0f209b9d8dfe17b8 (diff) | |
parent | a84aadf66a5970b4ada37b58f16c50dd797f2935 (diff) | |
download | linux-crypto-dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c.tar.gz linux-crypto-dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd:
- Fix a potential crash after kexec on arm64 with GICv3
- Fix a build warning on x86
- Stop policing the BGRT feature flags
- Use a non-blocking version of SetVariable() in the boot control driver
Diffstat (limited to 'crypto/hmac.c')
-rw-r--r-- | crypto/hmac.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index 241b1868..8b2a212e 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cryptographic API. * @@ -8,12 +9,6 @@ * * The HMAC implementation is derived from USAGI. * Copyright (c) 2002 Kazunori Miyazawa <miyazawa@linux-ipv6.org> / USAGI - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * */ #include <crypto/hmac.h> @@ -157,8 +152,10 @@ static int hmac_init_tfm(struct crypto_tfm *tfm) parent->descsize = sizeof(struct shash_desc) + crypto_shash_descsize(hash); - if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) + if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) { + crypto_free_shash(hash); return -EINVAL; + } ctx->hash = hash; return 0; |