Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: ff-core - prefer struct_size over open coded arithmetic

This is an effort to get rid of all multiplications from allocation
functions in order to prevent integer overflows [1][2].

As the "ff" variable is a pointer to "struct ff_device" and this
structure ends in a flexible array:

struct ff_device {
[...]
struct file *effect_owners[] __counted_by(max_effects);
};

the preferred way in the kernel is to use the struct_size() helper to
do the arithmetic instead of the calculation "size + count * size" in
the kzalloc() function.

The struct_size() helper returns SIZE_MAX on overflow. So, refactor
the comparison to take advantage of this.

This way, the code is more readable and safer.

This code was detected with the help of Coccinelle, and audited and
modified manually.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1]
Link: https://github.com/KSPP/linux/issues/160 [2]
Signed-off-by: Erick Archer <erick.archer@outlook.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/AS8PR02MB72371E646714BAE2E51A6A378B152@AS8PR02MB7237.eurprd02.prod.outlook.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Erick Archer and committed by
Dmitry Torokhov
a08b8f85 7b4e0b39

+4 -3
+4 -3
drivers/input/ff-core.c
··· 9 9 /* #define DEBUG */ 10 10 11 11 #include <linux/input.h> 12 + #include <linux/limits.h> 12 13 #include <linux/module.h> 13 14 #include <linux/mutex.h> 15 + #include <linux/overflow.h> 14 16 #include <linux/sched.h> 15 17 #include <linux/slab.h> 16 18 ··· 317 315 return -EINVAL; 318 316 } 319 317 320 - ff_dev_size = sizeof(struct ff_device) + 321 - max_effects * sizeof(struct file *); 322 - if (ff_dev_size < max_effects) /* overflow */ 318 + ff_dev_size = struct_size(ff, effect_owners, max_effects); 319 + if (ff_dev_size == SIZE_MAX) /* overflow */ 323 320 return -EINVAL; 324 321 325 322 ff = kzalloc(ff_dev_size, GFP_KERNEL);