mirror of
https://github.com/torvalds/linux.git
synced 2024-12-10 05:01:26 +00:00
a86854d0c5
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc(). This patch replaces cases of: devm_kzalloc(handle, a * b, gfp) with: devm_kcalloc(handle, a * b, gfp) as well as handling cases of: devm_kzalloc(handle, a * b * c, gfp) with: devm_kzalloc(handle, array3_size(a, b, c), gfp) as it's slightly less ugly than: devm_kcalloc(handle, array_size(a, b), c, gfp) This does, however, attempt to ignore constant size factors like: devm_kzalloc(handle, 4 * 1024, gfp) 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. Some manual whitespace fixes were needed in this patch, as Coccinelle really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...". The Coccinelle script used for this was: // Fix redundant parens around sizeof(). @@ expression HANDLE; type TYPE; expression THING, E; @@ ( devm_kzalloc(HANDLE, - (sizeof(TYPE)) * E + sizeof(TYPE) * E , ...) | devm_kzalloc(HANDLE, - (sizeof(THING)) * E + sizeof(THING) * E , ...) ) // Drop single-byte sizes and redundant parens. @@ expression HANDLE; expression COUNT; typedef u8; typedef __u8; @@ ( devm_kzalloc(HANDLE, - sizeof(u8) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(__u8) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(char) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(unsigned char) * (COUNT) + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(u8) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(__u8) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(char) * COUNT + COUNT , ...) | devm_kzalloc(HANDLE, - sizeof(unsigned char) * COUNT + COUNT , ...) ) // 2-factor product with sizeof(type/expression) and identifier or constant. @@ expression HANDLE; type TYPE; expression THING; identifier COUNT_ID; constant COUNT_CONST; @@ ( - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (COUNT_ID) + COUNT_ID, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * COUNT_ID + COUNT_ID, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (COUNT_CONST) + COUNT_CONST, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * COUNT_CONST + COUNT_CONST, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (COUNT_ID) + COUNT_ID, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * COUNT_ID + COUNT_ID, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (COUNT_CONST) + COUNT_CONST, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * COUNT_CONST + COUNT_CONST, sizeof(THING) , ...) ) // 2-factor product, only identifiers. @@ expression HANDLE; identifier SIZE, COUNT; @@ - devm_kzalloc + devm_kcalloc (HANDLE, - SIZE * COUNT + COUNT, SIZE , ...) // 3-factor product with 1 sizeof(type) or sizeof(expression), with // redundant parens removed. @@ expression HANDLE; expression THING; identifier STRIDE, COUNT; type TYPE; @@ ( devm_kzalloc(HANDLE, - sizeof(TYPE) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(TYPE)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * (COUNT) * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * (COUNT) * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * COUNT * (STRIDE) + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING) * COUNT * STRIDE + array3_size(COUNT, STRIDE, sizeof(THING)) , ...) ) // 3-factor product with 2 sizeof(variable), with redundant parens removed. @@ expression HANDLE; expression THING1, THING2; identifier COUNT; type TYPE1, TYPE2; @@ ( devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(TYPE2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(THING1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(THING1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * COUNT + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) | devm_kzalloc(HANDLE, - sizeof(TYPE1) * sizeof(THING2) * (COUNT) + array3_size(COUNT, sizeof(TYPE1), sizeof(THING2)) , ...) ) // 3-factor product, only identifiers, with redundant parens removed. @@ expression HANDLE; identifier STRIDE, SIZE, COUNT; @@ ( devm_kzalloc(HANDLE, - (COUNT) * STRIDE * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * (STRIDE) * SIZE + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - COUNT * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * STRIDE * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - (COUNT) * (STRIDE) * (SIZE) + array3_size(COUNT, STRIDE, SIZE) , ...) | devm_kzalloc(HANDLE, - 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 HANDLE; expression E1, E2, E3; constant C1, C2, C3; @@ ( devm_kzalloc(HANDLE, C1 * C2 * C3, ...) | devm_kzalloc(HANDLE, - (E1) * E2 * E3 + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - (E1) * (E2) * E3 + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - (E1) * (E2) * (E3) + array3_size(E1, E2, E3) , ...) | devm_kzalloc(HANDLE, - 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 HANDLE; expression THING, E1, E2; type TYPE; constant C1, C2, C3; @@ ( devm_kzalloc(HANDLE, sizeof(THING) * C2, ...) | devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...) | devm_kzalloc(HANDLE, C1 * C2 * C3, ...) | devm_kzalloc(HANDLE, C1 * C2, ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * (E2) + E2, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(TYPE) * E2 + E2, sizeof(TYPE) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * (E2) + E2, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - sizeof(THING) * E2 + E2, sizeof(THING) , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - (E1) * E2 + E1, E2 , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - (E1) * (E2) + E1, E2 , ...) | - devm_kzalloc + devm_kcalloc (HANDLE, - E1 * E2 + E1, E2 , ...) ) Signed-off-by: Kees Cook <keescook@chromium.org> |
||
---|---|---|
.. | ||
pmbus | ||
ab8500.c | ||
abituguru3.c | ||
abituguru.c | ||
abx500.c | ||
abx500.h | ||
acpi_power_meter.c | ||
ad7314.c | ||
ad7414.c | ||
ad7418.c | ||
adc128d818.c | ||
adcxx.c | ||
adm1021.c | ||
adm1025.c | ||
adm1026.c | ||
adm1029.c | ||
adm1031.c | ||
adm9240.c | ||
ads1015.c | ||
ads7828.c | ||
ads7871.c | ||
adt7x10.c | ||
adt7x10.h | ||
adt7310.c | ||
adt7410.c | ||
adt7411.c | ||
adt7462.c | ||
adt7470.c | ||
adt7475.c | ||
amc6821.c | ||
applesmc.c | ||
asb100.c | ||
asc7621.c | ||
aspeed-pwm-tacho.c | ||
asus_atk0110.c | ||
atxp1.c | ||
coretemp.c | ||
da9052-hwmon.c | ||
da9055-hwmon.c | ||
dell-smm-hwmon.c | ||
dme1737.c | ||
ds620.c | ||
ds1621.c | ||
emc6w201.c | ||
emc1403.c | ||
emc2103.c | ||
f71805f.c | ||
f71882fg.c | ||
f75375s.c | ||
fam15h_power.c | ||
fschmd.c | ||
ftsteutates.c | ||
g760a.c | ||
g762.c | ||
gl518sm.c | ||
gl520sm.c | ||
gpio-fan.c | ||
hih6130.c | ||
hwmon-vid.c | ||
hwmon.c | ||
i5k_amb.c | ||
i5500_temp.c | ||
ibmaem.c | ||
ibmpex.c | ||
ibmpowernv.c | ||
iio_hwmon.c | ||
ina2xx.c | ||
ina209.c | ||
ina3221.c | ||
it87.c | ||
jc42.c | ||
jz4740-hwmon.c | ||
k8temp.c | ||
k10temp.c | ||
Kconfig | ||
lineage-pem.c | ||
lm63.c | ||
lm70.c | ||
lm73.c | ||
lm75.c | ||
lm75.h | ||
lm77.c | ||
lm78.c | ||
lm80.c | ||
lm83.c | ||
lm85.c | ||
lm87.c | ||
lm90.c | ||
lm92.c | ||
lm93.c | ||
lm95234.c | ||
lm95241.c | ||
lm95245.c | ||
ltc2945.c | ||
ltc2990.c | ||
ltc4151.c | ||
ltc4215.c | ||
ltc4222.c | ||
ltc4245.c | ||
ltc4260.c | ||
ltc4261.c | ||
ltq-cputemp.c | ||
Makefile | ||
max197.c | ||
max1111.c | ||
max1619.c | ||
max1668.c | ||
max6621.c | ||
max6639.c | ||
max6642.c | ||
max6650.c | ||
max6697.c | ||
max16065.c | ||
max31722.c | ||
max31790.c | ||
mc13783-adc.c | ||
mcp3021.c | ||
menf21bmc_hwmon.c | ||
nct6683.c | ||
nct6775.c | ||
nct7802.c | ||
nct7904.c | ||
nsa320-hwmon.c | ||
ntc_thermistor.c | ||
pc87360.c | ||
pc87427.c | ||
pcf8591.c | ||
powr1220.c | ||
pwm-fan.c | ||
s3c-hwmon.c | ||
sch56xx-common.c | ||
sch56xx-common.h | ||
sch5627.c | ||
sch5636.c | ||
scmi-hwmon.c | ||
scpi-hwmon.c | ||
sht3x.c | ||
sht15.c | ||
sht21.c | ||
shtc1.c | ||
sis5595.c | ||
smm665.c | ||
smsc47b397.c | ||
smsc47m1.c | ||
smsc47m192.c | ||
stts751.c | ||
tc74.c | ||
tc654.c | ||
thmc50.c | ||
tmp102.c | ||
tmp103.c | ||
tmp108.c | ||
tmp401.c | ||
tmp421.c | ||
ultra45_env.c | ||
vexpress-hwmon.c | ||
via686a.c | ||
via-cputemp.c | ||
vt1211.c | ||
vt8231.c | ||
w83l785ts.c | ||
w83l786ng.c | ||
w83627ehf.c | ||
w83627hf.c | ||
w83773g.c | ||
w83781d.c | ||
w83791d.c | ||
w83792d.c | ||
w83793.c | ||
w83795.c | ||
wm831x-hwmon.c | ||
wm8350-hwmon.c | ||
xgene-hwmon.c |