diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-06-19 15:18:48 +0200 |
commit | dd90ed66a1cd9cb277881b40295229ba2f81355e (patch) | |
tree | 9d316a6f7ed462d132786f074da835b8ff1f7196 /crypto/hmac.c | |
parent | cd574ee16ffa2f2cad8414b9c59520e3e08a77f9 (diff) | |
parent | a84aadf66a5970b4ada37b58f16c50dd797f2935 (diff) | |
download | linux-crypto-dd90ed66a1cd9cb277881b40295229ba2f81355e.tar.gz linux-crypto-dd90ed66a1cd9cb277881b40295229ba2f81355e.zip |
Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next
topic/remove-fbcon-notifiers:
- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
- assorted locking checks in vt/console code
- assorted notifier and cleanups in fbdev and backlight code
One trivial merge conflict fixed.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to '')
-rw-r--r-- | crypto/hmac.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index a68c1266..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,6 +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)) { + crypto_free_shash(hash); + return -EINVAL; + } ctx->hash = hash; return 0; |