]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: greybus: power_supply: use struct_size() helper
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 17 Apr 2019 18:44:40 +0000 (13:44 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Apr 2019 13:03:07 +0000 (15:03 +0200)
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 <gustavo@embeddedor.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/greybus/power_supply.c

index ae5c0285a9420f7325612798e13c1bc91a9fe5e9..34b40a409ea3e932c1c3a53b40d2f3010f0e2728 100644 (file)
@@ -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;