Commit c2cd0b08 authored by Kees Cook's avatar Kees Cook Committed by Rafael J. Wysocki

x86/power/hibernate_64: Remove VLA usage

In the quest to remove all stack VLA usage from the kernel [1], this
removes the discouraged use of AHASH_REQUEST_ON_STACK by switching to
shash directly and allocating the descriptor in heap memory (which should
be fine: the tfm has already been allocated there too).

Link: https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com # [1]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d5641c64
...@@ -233,29 +233,35 @@ struct restore_data_record { ...@@ -233,29 +233,35 @@ struct restore_data_record {
*/ */
static int get_e820_md5(struct e820_table *table, void *buf) static int get_e820_md5(struct e820_table *table, void *buf)
{ {
struct scatterlist sg; struct crypto_shash *tfm;
struct crypto_ahash *tfm; struct shash_desc *desc;
int size; int size;
int ret = 0; int ret = 0;
tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC); tfm = crypto_alloc_shash("md5", 0, 0);
if (IS_ERR(tfm)) if (IS_ERR(tfm))
return -ENOMEM; return -ENOMEM;
{ desc = kmalloc(sizeof(struct shash_desc) + crypto_shash_descsize(tfm),
AHASH_REQUEST_ON_STACK(req, tfm); GFP_KERNEL);
size = offsetof(struct e820_table, entries) + sizeof(struct e820_entry) * table->nr_entries; if (!desc) {
ahash_request_set_tfm(req, tfm); ret = -ENOMEM;
sg_init_one(&sg, (u8 *)table, size); goto free_tfm;
ahash_request_set_callback(req, 0, NULL, NULL);
ahash_request_set_crypt(req, &sg, buf, size);
if (crypto_ahash_digest(req))
ret = -EINVAL;
ahash_request_zero(req);
} }
crypto_free_ahash(tfm);
desc->tfm = tfm;
desc->flags = 0;
size = offsetof(struct e820_table, entries) +
sizeof(struct e820_entry) * table->nr_entries;
if (crypto_shash_digest(desc, (u8 *)table, size, buf))
ret = -EINVAL;
kzfree(desc);
free_tfm:
crypto_free_shash(tfm);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment