diff options
| author |   Kees Cook <keescook@chromium.org> | 2018-06-29 11:48:50 -0700 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2018-07-09 11:33:02 +0200 |
| commit | 6663484b4e2d98f5609dc1b90fe4c242dd8fe18a (patch) | |
| tree | 613906b2b343dab28743ee97f4e24ac1727f5145 /drivers/edac | |
| parent | EDAC, i7core: Fix memleaks and use-after-free on probe and remove (diff) | |
| download | linux-dev-6663484b4e2d98f5609dc1b90fe4c242dd8fe18a.tar.xz linux-dev-6663484b4e2d98f5609dc1b90fe4c242dd8fe18a.zip | |
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: Kees Cook <keescook@chromium.org>
Acked-by: Jan 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: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/thunderx_edac.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index 4803c6468bab..c009d94f40c5 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -408,26 +408,29 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file, size_t count, loff_t *ppos) { struct thunderx_lmc *lmc = file->private_data; - unsigned int cline_size = cache_line_size(); - - u8 tmp[cline_size]; + u8 *tmp; void __iomem *addr; unsigned int offs, timeout = 100000; atomic_set(&lmc->ecc_int, 0); lmc->mem = alloc_pages_node(lmc->node, GFP_KERNEL, 0); - if (!lmc->mem) return -ENOMEM; + tmp = kmalloc(cline_size, GFP_KERNEL); + if (!tmp) { + __free_pages(lmc->mem, 0); + return -ENOMEM; + } + addr = page_address(lmc->mem); while (!atomic_read(&lmc->ecc_int) && timeout--) { 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 * This should generate an error interrupt. @@ -437,6 +440,7 @@ static ssize_t thunderx_lmc_inject_ecc_write(struct file *file, } } + kfree(tmp); __free_pages(lmc->mem, 0); return count; |