Commit 330d5589 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Linus Torvalds
Browse files

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: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarAndrew 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 216ec27f

drivers/rapidio/rio-scan.c

+3 −5
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net, 
	size_t size;

	u32 swpinfo = 0;



	size = sizeof(struct rio_dev);

	size = sizeof(*rdev);

	if (rio_mport_read_config_32(port, destid, hopcount,

				     RIO_PEF_CAR, &result))

		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)) {

		rio_mport_read_config_32(port, destid, hopcount,

					 RIO_SWP_INFO_CAR, &swpinfo);

		if (result & RIO_PEF_SWITCH) {

			size += (RIO_GET_TOTAL_PORTS(swpinfo) *

				sizeof(rswitch->nextdev[0])) + sizeof(*rswitch);

		}

		if (result & RIO_PEF_SWITCH)

			size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo));

	}



	rdev = kzalloc(size, GFP_KERNEL);