diff options
| author |  Tzung-Bi Shih <tzungbi@kernel.org>
| 2022-06-09 08:49:57 +0000 |
|---|---|---|
| committer | Tzung-Bi Shih <tzungbi@kernel.org>
| 2022-06-10 02:31:44 +0000 |
| commit | cfed691b80dce32b62634b1d7f92a661a3b03e4f (patch) | |
| tree | f78949dbfc58d8b25112992535a4a4c5885a9876 /drivers/platform/chrome/cros_ec_proto.c | |
| parent | platform/chrome: cros_ec_proto: add Kunit test for getting wake mask (diff) | |
| download | linux-cfed691b80dce32b62634b1d7f92a661a3b03e4f.tar.gz linux-cfed691b80dce32b62634b1d7f92a661a3b03e4f.tar.bz2 linux-cfed691b80dce32b62634b1d7f92a661a3b03e4f.zip | |
platform/chrome: cros_ec_proto: handle empty payload in getting wake mask
cros_ec_get_host_event_wake_mask() expects to receive
sizeof(struct ec_response_host_event_mask) from send_command(). The
payload is valid only if the return value is positive.
Return -EPROTO if send_command() returns 0 in
cros_ec_get_host_event_wake_mask().
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20220609084957.3684698-22-tzungbi@kernel.org
Diffstat (limited to 'drivers/platform/chrome/cros_ec_proto.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_proto.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c index a7d807c9b3bd..1bd567244f8e 100644 --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -256,19 +256,23 @@ static int cros_ec_get_host_event_wake_mask(struct cros_ec_device *ec_dev, uint3 msg->insize = sizeof(*r); ret = send_command(ec_dev, msg); - if (ret >= 0) { - mapped = cros_ec_map_error(msg->result); - if (mapped) { - ret = mapped; - goto exit; - } + if (ret < 0) + goto exit; + + mapped = cros_ec_map_error(msg->result); + if (mapped) { + ret = mapped; + goto exit; } - if (ret > 0) { - r = (struct ec_response_host_event_mask *)msg->data; - *mask = r->mask; - ret = 0; + + if (ret == 0) { + ret = -EPROTO; + goto exit; } + r = (struct ec_response_host_event_mask *)msg->data; + *mask = r->mask; + ret = 0; exit: kfree(msg); return ret; |