]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: greybus: power_supply: fix prop-descriptor request size
authorJohan Hovold <johan@kernel.org>
Thu, 4 Apr 2019 06:53:30 +0000 (08:53 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1838459
commit 47830c1127ef166af787caf2f871f23089610a7f upstream.

Since moving the message buffers off the stack, the dynamically
allocated get-prop-descriptor request buffer is incorrectly sized due to
using the pointer rather than request-struct size when creating the
operation.

Fortunately, the pointer size is always larger than this one-byte
request, but this could still cause trouble on the remote end due to the
unexpected message size.

Fixes: 9d15134d067e ("greybus: power_supply: rework get descriptors")
Cc: stable <stable@vger.kernel.org> # 4.9
Cc: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/staging/greybus/power_supply.c

index 0529e5628c24c40c56c1785f7b9c3cf9b058f1aa..ae5c0285a9420f7325612798e13c1bc91a9fe5e9 100644 (file)
@@ -520,7 +520,7 @@ 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(*req), sizeof(*resp) + props_count *
                                 sizeof(struct gb_power_supply_props_desc),
                                 GFP_KERNEL);
        if (!op)