mtd: maps: sa1100-flash: 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 "info" variable is a pointer to "struct sa_info" and this structure ends in a flexible array: struct sa_info { [...] struct sa_subdev_info subdev[]; }; the preferred way in the kernel is to use the struct_size() helper to do the arithmetic instead of the calculation "size + size * count" in the kzalloc() function. 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> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/AS8PR02MB7237AC633B0D1D2EBD3C40E98B392@AS8PR02MB7237.eurprd02.prod.outlook.com
This commit is contained in:
parent
5043e55536
commit
3ef4600f12
1 changed files with 2 additions and 4 deletions
|
@ -153,7 +153,7 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
|
|||
struct flash_platform_data *plat)
|
||||
{
|
||||
struct sa_info *info;
|
||||
int nr, size, i, ret = 0;
|
||||
int nr, i, ret = 0;
|
||||
|
||||
/*
|
||||
* Count number of devices.
|
||||
|
@ -167,12 +167,10 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
|
|||
goto out;
|
||||
}
|
||||
|
||||
size = sizeof(struct sa_info) + sizeof(struct sa_subdev_info) * nr;
|
||||
|
||||
/*
|
||||
* Allocate the map_info structs in one go.
|
||||
*/
|
||||
info = kzalloc(size, GFP_KERNEL);
|
||||
info = kzalloc(struct_size(info, subdev, nr), GFP_KERNEL);
|
||||
if (!info) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
|
|
Loading…
Reference in a new issue