2019-05-27 08:55:05 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-29 16:02:50 +11:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2010-03-11 21:13:20 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-31 14:51:31 +02:00
|
|
|
|
2011-05-18 11:28:40 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2013-03-17 20:07:25 +08:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-09-03 10:53:11 +02:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2020-12-09 09:45:51 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2018-03-29 12:03:19 +03:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-17 20:07:25 +08:00
|
|
|
|
2018-06-13 01:43:01 +03:00
|
|
|
|
2013-03-17 20:07:25 +08:00
|
|
|
|
2018-06-13 01:43:01 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-17 20:07:25 +08:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2019-02-18 00:17:21 +02:00
|
|
|
|
|
|
|
|
|
2013-03-17 20:07:25 +08:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-04-21 11:23:57 +09:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-01-10 16:30:54 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2013-04-17 00:01:40 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2020-02-11 12:14:19 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2020-11-23 09:53:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-11-21 15:25:56 +05:30
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(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.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- 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;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- 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;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 13:55:00 -07:00
|
|
|
|
|
|
|
|
|
2016-08-21 10:17:36 +08:00
|
|
|
|
2012-11-21 15:25:56 +05:30
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-04-28 16:18:40 +02:00
|
|
|
|
2021-06-16 18:34:55 +09:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2011-04-28 16:18:40 +02:00
|
|
|
|
2021-06-16 18:34:55 +09:00
|
|
|
|
2011-04-28 16:18:40 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-01-14 13:42:57 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:38 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:18 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-11-21 15:25:56 +05:30
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2020-11-23 09:53:38 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-02-11 12:14:19 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-02-15 03:23:35 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-04-18 20:58:15 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-01-08 09:02:52 -05:00
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-02-15 03:23:35 +02:00
|
|
|
|
|
|
|
|
|
2021-12-02 09:38:33 +01:00
|
|
|
|
2020-02-15 03:23:35 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-04-18 20:58:15 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-02-14 05:18:48 -05:00
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2012-01-08 09:02:52 -05:00
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
2020-02-15 03:23:35 +02:00
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-06-14 17:11:47 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2019-07-07 09:27:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-01-05 09:19:00 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2021-10-30 15:04:05 -05:00
|
|
|
|
2020-10-20 08:14:09 +02:00
|
|
|
|
2020-01-26 09:31:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-06-14 17:11:47 -07:00
|
|
|
|
2020-02-11 12:14:19 +01:00
|
|
|
|
2019-07-07 09:27:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2021-05-21 15:37:42 +02:00
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2021-01-23 16:58:42 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2021-07-29 09:43:59 +02:00
|
|
|
|
2021-01-23 16:58:42 +01:00
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:38 +01:00
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-06-16 17:57:31 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2019-07-07 09:27:34 +01:00
|
|
|
|
2020-02-13 02:54:50 +03:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-06-11 17:34:19 +02:00
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
2010-06-11 17:34:19 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:34:20 +02:00
|
|
|
|
|
|
|
|
|
2011-09-26 21:15:27 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2019-07-07 09:27:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-31 14:51:31 +02:00
|
|
|
|
2019-07-07 09:27:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-31 14:51:31 +02:00
|
|
|
|
2010-06-11 17:34:20 +02:00
|
|
|
|
|
|
|
|
|
2011-09-26 21:15:27 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
2010-05-31 14:51:31 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(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.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- 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;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- 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;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 13:55:00 -07:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-06-11 17:46:33 +02:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
2020-11-23 09:53:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-11-23 09:53:09 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2013-04-23 01:00:41 +02:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2013-04-23 01:00:41 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-04-23 01:00:41 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:16 +01:00
|
|
|
|
2012-11-21 15:25:56 +05:30
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-09-03 10:53:11 +02:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-05-26 18:11:36 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-11-21 15:25:56 +05:30
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:15 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2010-03-04 19:46:15 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-03-04 19:46:15 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-09-03 10:53:11 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-17 20:07:24 +08:00
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
2013-03-17 20:07:24 +08:00
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-26 18:11:36 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2013-01-31 21:39:17 +01:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2014-02-26 13:02:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-26 18:11:37 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
2010-05-26 18:11:36 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-05-26 18:11:36 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
2010-05-26 18:11:37 +02:00
|
|
|
|
2010-03-04 19:46:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-03-21 02:03:59 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|