staging: greybus: power_supply: Use struct_size() helper
Subsystems (3)
PATCH 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.
--- drivers/staging/greybus/power_supply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/greybus/power_supply.c +2 -2
@@ -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
Johan Hovold
maintainerQuoted 24 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)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/staging/greybus/power_supply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/greybus/power_supply.c +0
-0
drivers/staging/greybus/power_supply.c static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy) · line 523
Quoted 4 lines
drivers/staging/greybus/power_supply.c +0
-1@@ -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 *
This patch looks good, but I noticed a bug here in the current code, which should be fixed before applying this clean up.
sizeof(req) should have been sizeof(*req) above.
drivers/staging/greybus/power_supply.c static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy) · line 527
Quoted 6 lines
drivers/staging/greybus/power_supply.c +2
-1-sizeof (struct gb_power_supply_props_desc ), +sizeof (req), +struct_size (resp, props, props_count), GFP_KERNEL);if (!op)return -ENOMEM ;
I've just submitted a fix (and CCed you as well).
Would you mind respinning on top of that one?
Thanks,
Johan
Rui Miguel Silva
maintainerHi Gustavo,
Thanks a lot for the patch.
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.
Signed-off-by Gustavo A. R. Silva <[email protected]>
What are the odds of 2 people changing same code in greybus in the same day :).
But it happened, so as Johan asked please rebase on top of his patch. that would be great.
---
Cheers,
Rui
Quoted 23 lines
--- drivers/staging/greybus/power_supply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/greybus/power_supply.c +0
-1@@ -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
-0GFP_KERNEL);if (!op)return -ENOMEM ;
Johan Hovold
maintainerQuoted 17 lines · Rui Miguel Silva
Hi Gustavo,
Thanks a lot for the patch.Quoted 13 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(structgb_power_supply_props_desc)with:
Quoted 8 lines
Quoted 5 lines
struct_size(resp, props, props_count)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>What are the odds of 2 people changing same code in greybus in the same day :).
Well, I only noticed the bug in the current code, when reviewing Gustavo's diff. ;)
Johan
Hi Johan,
Quoted 6 lines · Johan Hovold
This patch looks good, but I noticed a bug here in the current code, which should be fixed before applying this clean up.
sizeof(req) should have been
sizeof(*req)above.
Good catch.
Quoted 11 lines
drivers/staging/greybus/power_supply.c static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy) · line 527
Quoted 6 lines
drivers/staging/greybus/power_supply.c +2
-1-sizeof (struct gb_power_supply_props_desc ), +sizeof (req), +struct_size (resp, props, props_count), GFP_KERNEL);if (!op)return -ENOMEM ;I've just submitted a fix (and CCed you as well).
Would you mind respinning on top of that one?
Yep. I'll send v2 shortly.
Thanks
--
Gustavo
Johan,
Quoted 22 lines · Johan Hovold
Quoted 21 lines · Rui Miguel Silva
Hi Gustavo,
Thanks a lot for the patch.Quoted 17 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(structgb_power_supply_props_desc)with:
struct_size(resp, props, props_count)This code was detected with the help of Coccinelle.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Gustavo A. R. Silva <[email protected]>What are the odds of 2 people changing same code in greybus in the same day :).
Well, I only noticed the bug in the current code, when reviewing Gustavo's diff. ;)
Apparently, your patch hasn't been applied to any tree yet. So, I'll wait for it to be applied before sending v2.
Thanks
--
Gustavo