Skip to contentSkip to conversation

rapidio: rio_mport_cdev: Use struct_size() helper

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Jun 19, 2020 – Jun 20, 2020 Rapidio

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rapidio: rio_mport_cdev: 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

---
 drivers/rapidio/devices/rio_mport_cdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/rapidio/devices/rio_mport_cdev.c +1 -2
index 451608e960a1..3abbba8c2b5b 100644
@@ -1710,8 +1710,7 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv,
 	if (rval & RIO_PEF_SWITCH) {
 		rio_mport_read_config_32(mport, destid, hopcount,
 					 RIO_SWP_INFO_CAR, &swpinfo);
-		size += (RIO_GET_TOTAL_PORTS(swpinfo) *
-			 sizeof(rswitch->nextdev[0])) + sizeof(*rswitch);
+		size += struct_size(rswitch, nextdev, RIO_GET_TOTAL_PORTS(swpinfo));
 	}
 
 	rdev = kzalloc(size, GFP_KERNEL);
Signature · 1 line
2.27.0
#1 lore raw
Quoted 1 line · On Fri, 19 Jun 2020 12:08:43 -0500 "Gustavo A. R. Silva"…

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

Well. There's only one other Addresses-KSPP-ID: in kernel history and I'm a bit reluctant to add new signoff tags such as this. People like to invent new tags an awful lot.

If for no other reason than that checkpatch doesn't know about them and has a big whine.