treewide: Use struct_size() for devm_kmalloc() and friends
Replaces open-coded struct size calculations with struct_size() for
devm_*, f2fs_*, and sock_* allocations. Automatically generated (and
manually adjusted) from the following Coccinelle script:
// Direct reference to struct field.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(*VAR->ELEMENT), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)
// mr = kzalloc(sizeof(*mr) + m * sizeof(mr->map[0]), GFP_KERNEL);
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(VAR->ELEMENT[0]), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)
// Same pattern, but can't trivially locate the trailing element name,
// or variable name.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
expression SOMETHING, COUNT, ELEMENT;
@@
- alloc(HANDLE, sizeof(SOMETHING) + COUNT * sizeof(ELEMENT), GFP)
+ alloc(HANDLE, CHECKME_struct_size(&SOMETHING, ELEMENT, COUNT), GFP)
Signed-off-by:
Kees Cook <keescook@chromium.org>
Showing
- crypto/af_alg.c 2 additions, 2 deletionscrypto/af_alg.c
- drivers/clk/bcm/clk-bcm2835-aux.c 4 additions, 2 deletionsdrivers/clk/bcm/clk-bcm2835-aux.c
- drivers/clk/bcm/clk-bcm2835.c 2 additions, 2 deletionsdrivers/clk/bcm/clk-bcm2835.c
- drivers/clk/clk-s2mps11.c 2 additions, 2 deletionsdrivers/clk/clk-s2mps11.c
- drivers/clk/clk-scmi.c 2 additions, 2 deletionsdrivers/clk/clk-scmi.c
- drivers/clk/davinci/da8xx-cfgchip.c 2 additions, 2 deletionsdrivers/clk/davinci/da8xx-cfgchip.c
- drivers/clk/mvebu/armada-37xx-periph.c 4 additions, 3 deletionsdrivers/clk/mvebu/armada-37xx-periph.c
- drivers/clk/mvebu/armada-37xx-tbg.c 2 additions, 2 deletionsdrivers/clk/mvebu/armada-37xx-tbg.c
- drivers/clk/qcom/clk-spmi-pmic-div.c 1 addition, 2 deletionsdrivers/clk/qcom/clk-spmi-pmic-div.c
- drivers/clk/samsung/clk-exynos-audss.c 2 additions, 2 deletionsdrivers/clk/samsung/clk-exynos-audss.c
- drivers/clk/samsung/clk-exynos5433.c 2 additions, 2 deletionsdrivers/clk/samsung/clk-exynos5433.c
- drivers/clk/samsung/clk-s3c2410-dclk.c 4 additions, 3 deletionsdrivers/clk/samsung/clk-s3c2410-dclk.c
- drivers/clk/samsung/clk-s5pv210-audss.c 1 addition, 2 deletionsdrivers/clk/samsung/clk-s5pv210-audss.c
- drivers/dma/bcm-sba-raid.c 2 additions, 3 deletionsdrivers/dma/bcm-sba-raid.c
- drivers/dma/nbpfaxi.c 2 additions, 2 deletionsdrivers/dma/nbpfaxi.c
- drivers/dma/sprd-dma.c 2 additions, 2 deletionsdrivers/dma/sprd-dma.c
- drivers/gpio/gpio-uniphier.c 1 addition, 2 deletionsdrivers/gpio/gpio-uniphier.c
- drivers/hwspinlock/sirf_hwspinlock.c 4 additions, 2 deletionsdrivers/hwspinlock/sirf_hwspinlock.c
- drivers/input/keyboard/cap11xx.c 1 addition, 2 deletionsdrivers/input/keyboard/cap11xx.c
- drivers/mfd/qcom-pm8xxx.c 2 additions, 2 deletionsdrivers/mfd/qcom-pm8xxx.c
Loading
Please register or sign in to comment