Commit d394ab5c authored by Tzung-Bi Shih's avatar Tzung-Bi Shih

platform/chrome: cros_ec_proto: handle empty payload in getting info legacy

cros_ec_get_proto_info_legacy() expects to receive
sizeof(struct ec_response_hello) 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_proto_info_legacy().
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarTzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20220609084957.3684698-13-tzungbi@kernel.org
parent cce5d551
...@@ -356,7 +356,7 @@ static int cros_ec_get_proto_info_legacy(struct cros_ec_device *ec_dev) ...@@ -356,7 +356,7 @@ static int cros_ec_get_proto_info_legacy(struct cros_ec_device *ec_dev)
struct cros_ec_command *msg; struct cros_ec_command *msg;
struct ec_params_hello *params; struct ec_params_hello *params;
struct ec_response_hello *response; struct ec_response_hello *response;
int ret; int ret, mapped;
ec_dev->proto_version = 2; ec_dev->proto_version = 2;
...@@ -377,12 +377,18 @@ static int cros_ec_get_proto_info_legacy(struct cros_ec_device *ec_dev) ...@@ -377,12 +377,18 @@ static int cros_ec_get_proto_info_legacy(struct cros_ec_device *ec_dev)
goto exit; goto exit;
} }
ret = cros_ec_map_error(msg->result); mapped = cros_ec_map_error(msg->result);
if (ret) { if (mapped) {
ret = mapped;
dev_err(ec_dev->dev, "EC responded to v2 hello with error: %d\n", msg->result); dev_err(ec_dev->dev, "EC responded to v2 hello with error: %d\n", msg->result);
goto exit; goto exit;
} }
if (ret == 0) {
ret = -EPROTO;
goto exit;
}
response = (struct ec_response_hello *)msg->data; response = (struct ec_response_hello *)msg->data;
if (response->out_data != 0xa1b2c3d4) { if (response->out_data != 0xa1b2c3d4) {
dev_err(ec_dev->dev, dev_err(ec_dev->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment