Skip to contentSkip to conversation

staging: greybus: power_supply: use struct_size() helper

PATCH In review Gustavo A. R. Silva 3 participants 4 messages Apr 17, 2019 – Apr 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: greybus: power_supply: 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, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(*resp) + props_count * sizeof(struct gb_power_supply_props_desc)

with:

struct_size(resp, props, props_count)

This code was detected with the help of Coccinelle.

---
Changes in v2:
- Rebase on top of 47830c1127ef ("staging: greybus: power_supply: fix prop-descriptor request size")

 drivers/staging/greybus/power_supply.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/greybus/power_supply.c +2 -2
index ae5c0285a942..34b40a409ea3 100644
@@ -520,8 +520,8 @@ static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy)
 
 	op = gb_operation_create(connection,
 				 GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS,
-				 sizeof(*req), sizeof(*resp) + props_count *
-				 sizeof(struct gb_power_supply_props_desc),
+				 sizeof(*req),
+				 struct_size(resp, props, props_count),
 				 GFP_KERNEL);
 	if (!op)
 		return -ENOMEM;
Signature · 1 line
2.21.0
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(*resp) + props_count * sizeof(struct gb_power_supply_props_desc)

with:

Quoted 8 lines

struct_size(resp, props, props_count)

This code was detected with the help of Coccinelle.

---
Changes in v2:
- Rebase on top of 47830c1127ef ("staging: greybus: power_supply: fix prop-descriptor request size")

Thanks for rebasing.

Johan

#2 lore raw
Quoted 13 lines · Johan Hovold
Quoted 12 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(*resp) + props_count * sizeof(struct gb_power_supply_props_desc)

with:

struct_size(resp, props, props_count)

Quoted 9 lines
Quoted 6 lines

This code was detected with the help of Coccinelle.

---
Changes in v2:
- Rebase on top of 47830c1127ef ("staging: greybus: power_supply: fix prop-descriptor request size")

Thanks for rebasing.

Glad to help. :)

Quoted 2 lines

Thanks
--
Gustavo

maintainer Reviewed-by on v2 1/1
#3 lore raw
In reply to Gustavo A. R. Silva

Oi Gustavo,
Thanks for the patch, and the rebasing.

Quoted 8 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(*resp) + props_count * sizeof(struct gb_power_supply_props_desc)

Quoted 7 lines

with:

struct_size(resp, props, props_count)

This code was detected with the help of Coccinelle.

---
Cheers,
Rui

Quoted 27 lines

---
Changes in v2:
- Rebase on top of 47830c1127ef ("staging: greybus:
power_supply: fix prop-descriptor request size")

 drivers/staging/greybus/power_supply.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/greybus/power_supply.c +0 -1
index ae5c0285a942..34b40a409ea3 100644
@@ -520,8 +520,8 @@ static int 
 gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy)
 
 	op = gb_operation_create(connection,
 				 GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS,
-				 sizeof(*req), sizeof(*resp) + 

props_count *

drivers/staging/greybus/power_supply.c +0 -1
-				 sizeof(struct 

gb_power_supply_props_desc),

drivers/staging/greybus/power_supply.c +2 -0
+				 sizeof(*req),
+				 struct_size(resp, props, 

props_count),

drivers/staging/greybus/power_supply.c +0 -0
 				 GFP_KERNEL);
 	if (!op)
 		return -ENOMEM;