UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers/rapidio/rio-scan.c: use struct_size() helper 

Make use of the struct_size() helper instead of an open-coded version in
order to avoid any potential type mistakes.

Also, while there, use the preferred form for passing a size of a struct.
The alternative form where struct name is spelled out hurts readability
and introduces an opportunity for a bug when the pointer variable type is
changed but the corresponding sizeof that is passed as argument is not.

This issue was found with the help of Coccinelle and, audited and fixed
manually.

Addresses KSPP ID: https://github.com/KSPP/linux/issues/83

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Link: http://lkml.kernel.org/r/20200619170445.GA22641@embeddedor
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Gustavo A. R. Silva 2020-08-11 18:36:40 -07:00 committed by Linus Torvalds
parent 216ec27f3c
commit 330d558960
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/rapidio/rio-scan.c
View File

@ -330,7 +330,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
size_t size; size_t size;
u32 swpinfo = 0; u32 swpinfo = 0;
size = sizeof(struct rio_dev); size = sizeof(*rdev);
if (rio_mport_read_config_32(port, destid, hopcount, if (rio_mport_read_config_32(port, destid, hopcount,
RIO_PEF_CAR, &result)) RIO_PEF_CAR, &result))
return NULL; return NULL;
@ -338,10 +338,8 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
if (result & (RIO_PEF_SWITCH | RIO_PEF_MULTIPORT)) { if (result & (RIO_PEF_SWITCH | RIO_PEF_MULTIPORT)) {
rio_mport_read_config_32(port, destid, hopcount, rio_mport_read_config_32(port, destid, hopcount,
RIO_SWP_INFO_CAR, &swpinfo); RIO_SWP_INFO_CAR, &swpinfo);
if (result & RIO_PEF_SWITCH) { if (result & RIO_PEF_SWITCH)
size += (RIO_GET_TOTAL_PORTS(swpinfo) * size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo));
sizeof(rswitch->nextdev[0])) + sizeof(*rswitch);
}
} }
rdev = kzalloc(size, GFP_KERNEL); rdev = kzalloc(size, GFP_KERNEL);