mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Erick Archer 2024-04-27 17:05:56 +02:00 committed by Dmitry Torokhov
parent 7b4e0b3918
commit a08b8f8557
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/input/ff-core.c
View File

@ -9,8 +9,10 @@
/* #define DEBUG */ /* #define DEBUG */
#include <linux/input.h> #include <linux/input.h>
#include <linux/limits.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/overflow.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -315,9 +317,8 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects)
return -EINVAL; return -EINVAL;
} }
ff_dev_size = sizeof(struct ff_device) + ff_dev_size = struct_size(ff, effect_owners, max_effects);
max_effects * sizeof(struct file *); if (ff_dev_size == SIZE_MAX) /* overflow */
if (ff_dev_size < max_effects) /* overflow */
return -EINVAL; return -EINVAL;
ff = kzalloc(ff_dev_size, GFP_KERNEL); ff = kzalloc(ff_dev_size, GFP_KERNEL);