Kees Cook 590b5b7d86 treewide: kzalloc_node() -> kcalloc_node() ... The kzalloc_node() function has a 2-factor argument form, kcalloc_node(). This patch replaces cases of: kzalloc_node(a * b, gfp, node) with: kcalloc_node(a * b, gfp, node) as well as handling cases of: kzalloc_node(a * b * c, gfp, node) with: kzalloc_node(array3_size(a, b, c), gfp, node) as it's slightly less ugly than: kcalloc_node(array_size(a, b), c, gfp, node) This does, however, attempt to ignore constant size factors like: kzalloc_node(4 * 1024, gfp, node) though any constants defined via macros get caught up in the conversion. Any factors with a sizeof() of "unsigned char", "char", and "u8" were dropped, since they're redundant. The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ type TYPE; expression THING, E; @@ ( kzalloc_node( - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | kzalloc_node( - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression COUNT; typedef u8; typedef __u8; @@ ( kzalloc_node( - sizeof(u8) * (COUNT) + COUNT , ...) | kzalloc_node( - sizeof(__u8) * (COUNT) + COUNT , ...) | kzalloc_node( - sizeof(char) * (COUNT) + COUNT , ...) | kzalloc_node( - sizeof(unsigned char) * (COUNT) + COUNT , ...) | kzalloc_node( - sizeof(u8) * COUNT + COUNT , ...) | kzalloc_node( - sizeof(__u8) * COUNT + COUNT , ...) | kzalloc_node( - sizeof(char) * COUNT + COUNT , ...) | kzalloc_node( - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ identifier SIZE, COUNT; @@ - kzalloc_node + kcalloc_node ( - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( kzalloc_node( - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc_node( - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc_node( - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc_node( - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | kzalloc_node( - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc_node( - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc_node( - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | kzalloc_node( - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( kzalloc_node( - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc_node( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | kzalloc_node( - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc_node( - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | kzalloc_node( - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | kzalloc_node( - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ identifier STRIDE, SIZE, COUNT; @@ ( kzalloc_node( - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | kzalloc_node( - COUNT * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) ) // Any remaining multi-factor products, first at least 3-factor products, // when they're not all constants... @@ expression E1, E2, E3; constant C1, C2, C3; @@ ( kzalloc_node(C1 * C2 * C3, ...) | kzalloc_node( - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | kzalloc_node( - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | kzalloc_node( - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | kzalloc_node( - E1 * E2 * E3 + array3_size(E1, E2, E3) , ...) ) // And then all remaining 2 factors products when they're not all constants, // keeping sizeof() as the second factor argument. @@ expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( kzalloc_node(sizeof(THING) * C2, ...) | kzalloc_node(sizeof(TYPE) * C2, ...) | kzalloc_node(C1 * C2 * C3, ...) | kzalloc_node(C1 * C2, ...) | - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - kzalloc_node + kcalloc_node ( - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - kzalloc_node + kcalloc_node ( - (E1) * E2 + E1, E2 , ...) | - kzalloc_node + kcalloc_node ( - (E1) * (E2) + E1, E2 , ...) | - kzalloc_node + kcalloc_node ( - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org>		2018-06-12 16:19:22 -07:00
..
whci
bcma-hcd.c
ehci-atmel.c
ehci-dbg.c	USB: ehci-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
ehci-exynos.c
ehci-fsl.c
ehci-fsl.h
ehci-grlib.c
ehci-hcd.c	USB: ehci-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
ehci-hub.c
ehci-mem.c	Revert "usb: host: ehci: Use dma_pool_zalloc()"	2018-05-04 14:35:12 -07:00
ehci-mv.c
ehci-mxc.c
ehci-omap.c	USB: ehci-omap: drop unused legacy phy support	2018-04-22 15:58:23 +02:00
ehci-orion.c
ehci-pci.c
ehci-platform.c
ehci-pmcmsp.c
ehci-ppc-of.c
ehci-ps3.c
ehci-q.c
ehci-sched.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
ehci-sh.c
ehci-spear.c
ehci-st.c
ehci-sysfs.c
ehci-tegra.c	usb: tegra: Move utmi-pads reset from ehci-tegra to tegra-phy	2018-04-23 09:50:57 +02:00
ehci-timer.c
ehci-w90x900.c
ehci-xilinx-of.c
ehci.h
fhci-dbg.c	USB: fhci-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
fhci-hcd.c
fhci-hub.c
fhci-mem.c
fhci-q.c
fhci-sched.c
fhci-tds.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
fhci.h	USB: fhci-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
fotg210-hcd.c	USB: fotg210-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
fotg210.h
fsl-mph-dr-of.c
hwa-hc.c
imx21-dbg.c	USB: imx21-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:22 +02:00
imx21-hcd.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
imx21-hcd.h
isp116x-hcd.c	USB: isp116x-hcd: no need to check return value of debugfs_create functions	2018-05-31 12:54:21 +02:00
isp116x.h
isp1362-hcd.c
isp1362.h	usb: isp1362: remove blackfin arch glue	2018-03-26 15:57:14 +02:00
Kconfig	xhci: hisilicon: support HiSilicon STB xHCI host controller	2018-05-24 18:03:07 +02:00
Makefile	xhci: hisilicon: support HiSilicon STB xHCI host controller	2018-05-24 18:03:07 +02:00
max3421-hcd.c
ohci-at91.c	usb: host: ohci: fix sfr kernel warning in ohci-at91 driver	2018-05-31 12:43:15 +02:00
ohci-da8xx.c
ohci-dbg.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
ohci-exynos.c
ohci-hcd.c	USB: ohci: no need to check return value of debugfs_create functions	2018-05-31 12:54:21 +02:00
ohci-hub.c
ohci-mem.c
ohci-nxp.c
ohci-omap.c
ohci-pci.c
ohci-platform.c
ohci-ppc-of.c
ohci-ps3.c
ohci-pxa27x.c
ohci-q.c
ohci-s3c2410.c
ohci-sa1111.c
ohci-sm501.c
ohci-spear.c
ohci-st.c
ohci-tmio.c
ohci.h	USB: ohci: no need to check return value of debugfs_create functions	2018-05-31 12:54:21 +02:00
oxu210hp-hcd.c
oxu210hp.h
pci-quirks.c	Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue"	2018-06-01 13:24:51 +02:00
pci-quirks.h	Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue"	2018-06-01 13:24:51 +02:00
r8a66597-hcd.c
r8a66597.h
sl811_cs.c
sl811-hcd.c
sl811.h
ssb-hcd.c
u132-hcd.c
uhci-debug.c
uhci-grlib.c
uhci-hcd.c	USB: uhci: no need to check return value of debugfs_create functions	2018-05-31 12:54:21 +02:00
uhci-hcd.h
uhci-hub.c
uhci-pci.c
uhci-platform.c
uhci-q.c
xhci-dbg.c
xhci-dbgcap.c	usb: xhci: dbc: Add SPDX identifiers to dbc files	2018-05-24 18:03:07 +02:00
xhci-dbgcap.h	usb: xhci: dbc: Add SPDX identifiers to dbc files	2018-05-24 18:03:07 +02:00
xhci-dbgtty.c	usb: xhci: dbc: Add SPDX identifiers to dbc files	2018-05-24 18:03:07 +02:00
xhci-debugfs.c	xhci: debugfs: add debugfs interface to enable compliance mode for a port	2018-05-24 18:03:09 +02:00
xhci-debugfs.h
xhci-ext-caps.c	xhci: Add Intel extended cap / otg phy mux handling	2018-03-22 13:40:10 +01:00
xhci-ext-caps.h	xhci: Add Intel extended cap / otg phy mux handling	2018-03-22 13:40:10 +01:00
xhci-histb.c	xhci: hisilicon: support HiSilicon STB xHCI host controller	2018-05-24 18:03:07 +02:00
xhci-hub.c	xhci: xhci-hub: use port structure members instead of xhci_get_ports()	2018-05-24 18:03:08 +02:00
xhci-mem.c	treewide: kzalloc_node() -> kcalloc_node()	2018-06-12 16:19:22 -07:00
xhci-mtk-sch.c	xhci-mtk: use xhci hub structures to get number of ports in roothubs	2018-05-24 18:03:08 +02:00
xhci-mtk.c
xhci-mtk.h
xhci-mvebu.c
xhci-mvebu.h
xhci-pci.c	Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue"	2018-06-01 13:24:51 +02:00
xhci-plat.c	usb: host: xhci-plat: Fix clock resource by adding a register clock	2018-04-22 16:07:25 +02:00
xhci-plat.h
xhci-rcar.c
xhci-rcar.h
xhci-ring.c	xhci: change xhci_test_and_clear_bit() to use new port structure	2018-05-24 18:03:08 +02:00
xhci-tegra.c	usb: xhci: tegra: Fix runtime PM support	2018-05-31 12:45:22 +02:00
xhci-trace.c
xhci-trace.h
xhci.c	xhci: Add quirk to zero 64bit registers on Renesas PCIe controllers	2018-06-01 13:24:51 +02:00
xhci.h	xhci: Add quirk to zero 64bit registers on Renesas PCIe controllers	2018-06-01 13:24:51 +02:00