mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-11 19:19:42 +00:00
acafe7e302
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct foo {
int stuff;
void *entry[];
};
instance = kmalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = kmalloc(struct_size(instance, entry, count), GFP_KERNEL);
This patch makes the changes for kmalloc()-family (and kvmalloc()-family)
uses. It was done via automatic conversion with manual review for the
"CHECKME" non-standard cases noted below, using the following Coccinelle
script:
// pkey_cache = kmalloc(sizeof *pkey_cache + tprops->pkey_tbl_len *
// sizeof *pkey_cache->table, GFP_KERNEL);
@@
identifier alloc =~ "kmalloc|kzalloc|kvmalloc|kvzalloc";
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(sizeof(*VAR) + COUNT * sizeof(*VAR->ELEMENT), GFP)
+ alloc(struct_size(VAR, ELEMENT, COUNT), GFP)
// mr = kzalloc(sizeof(*mr) + m * sizeof(mr->map[0]), GFP_KERNEL);
@@
identifier alloc =~ "kmalloc|kzalloc|kvmalloc|kvzalloc";
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(sizeof(*VAR) + COUNT * sizeof(VAR->ELEMENT[0]), GFP)
+ alloc(struct_size(VAR, ELEMENT, COUNT), GFP)
// Same pattern, but can't trivially locate the trailing element name,
// or variable name.
@@
identifier alloc =~ "kmalloc|kzalloc|kvmalloc|kvzalloc";
expression GFP;
expression SOMETHING, COUNT, ELEMENT;
@@
- alloc(sizeof(SOMETHING) + COUNT * sizeof(ELEMENT), GFP)
+ alloc(CHECKME_struct_size(&SOMETHING, ELEMENT, COUNT), GFP)
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||
|---|---|---|
| .. | ||
| adi | ||
| amd | ||
| atmel | ||
| au1x | ||
| bcm | ||
| cirrus | ||
| codecs | ||
| davinci | ||
| dwc | ||
| fsl | ||
| generic | ||
| hisilicon | ||
| img | ||
| intel | ||
| jz4740 | ||
| kirkwood | ||
| mediatek | ||
| mxs | ||
| nuc900 | ||
| omap | ||
| pxa | ||
| qcom | ||
| rockchip | ||
| samsung | ||
| sh | ||
| sirf | ||
| spear | ||
| sti | ||
| stm | ||
| sunxi | ||
| tegra | ||
| txx9 | ||
| uniphier | ||
| ux500 | ||
| xtensa | ||
| zte | ||
| Kconfig | ||
| Makefile | ||
| soc-ac97.c | ||
| soc-acpi.c | ||
| soc-cache.c | ||
| soc-compress.c | ||
| soc-core.c | ||
| soc-dapm.c | ||
| soc-devres.c | ||
| soc-generic-dmaengine-pcm.c | ||
| soc-io.c | ||
| soc-jack.c | ||
| soc-ops.c | ||
| soc-pcm.c | ||
| soc-topology.c | ||
| soc-utils.c | ||