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

drivers/rapidio/devices/rio_mport_cdev.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.

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/20200619170843.GA24923@embeddedor
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Gustavo A. R. Silva and committed by
Linus Torvalds
216ec27f 0935288c

+1 -2
+1 -2
drivers/rapidio/devices/rio_mport_cdev.c
··· 1710 1710 if (rval & RIO_PEF_SWITCH) { 1711 1711 rio_mport_read_config_32(mport, destid, hopcount, 1712 1712 RIO_SWP_INFO_CAR, &swpinfo); 1713 - size += (RIO_GET_TOTAL_PORTS(swpinfo) * 1714 - sizeof(rswitch->nextdev[0])) + sizeof(*rswitch); 1713 + size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo)); 1715 1714 } 1716 1715 1717 1716 rdev = kzalloc(size, GFP_KERNEL);