Commit 6663484b authored by Kees Cook's avatar Kees Cook Committed by Borislav Petkov

EDAC, thunderx: Remove VLA usage

In the quest to remove all stack VLA usage from the kernel[1], switch to
using a kmalloc-allocated buffer instead of stack space. This should be
fine since the existing routine is allocating memory too.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarJan Glauber <jglauber@cavium.com>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20180629184850.GA37464@beast
Link: https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com [1]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 6c974d4d
...@@ -408,26 +408,29 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file, ...@@ -408,26 +408,29 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct thunderx_lmc *lmc = file->private_data; struct thunderx_lmc *lmc = file->private_data;
unsigned int cline_size = cache_line_size(); unsigned int cline_size = cache_line_size();
u8 *tmp;
u8 tmp[cline_size];
void __iomem *addr; void __iomem *addr;
unsigned int offs, timeout = 100000; unsigned int offs, timeout = 100000;
atomic_set(&lmc->ecc_int, 0); atomic_set(&lmc->ecc_int, 0);
lmc->mem = alloc_pages_node(lmc->node, GFP_KERNEL, 0); lmc->mem = alloc_pages_node(lmc->node, GFP_KERNEL, 0);
if (!lmc->mem) if (!lmc->mem)
return -ENOMEM; return -ENOMEM;
tmp = kmalloc(cline_size, GFP_KERNEL);
if (!tmp) {
__free_pages(lmc->mem, 0);
return -ENOMEM;
}
addr = page_address(lmc->mem); addr = page_address(lmc->mem);
while (!atomic_read(&lmc->ecc_int) && timeout--) { while (!atomic_read(&lmc->ecc_int) && timeout--) {
stop_machine(inject_ecc_fn, lmc, NULL); stop_machine(inject_ecc_fn, lmc, NULL);
for (offs = 0; offs < PAGE_SIZE; offs += sizeof(tmp)) { for (offs = 0; offs < PAGE_SIZE; offs += cline_size) {
/* /*
* Do a load from the previously rigged location * Do a load from the previously rigged location
* This should generate an error interrupt. * This should generate an error interrupt.
...@@ -437,6 +440,7 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file, ...@@ -437,6 +440,7 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file,
} }
} }
kfree(tmp);
__free_pages(lmc->mem, 0); __free_pages(lmc->mem, 0);
return count; return count;
......
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