summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNamyoon Woo <namyoon@google.com>2018-06-15 14:53:02 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-06-18 13:54:51 -0700
commitbca6aa066bde16330bf4934c132f711109702dd0 (patch)
treecdbfe76869c1819a770acccf6fc0ae56ac8a3066
parentd58490e1b78f1b02958241120e13598f20da77b9 (diff)
downloadchrome-ec-bca6aa066bde16330bf4934c132f711109702dd0.tar.gz
cr50: Fix in vendor commands return values.
Vendor command wrap function returned always VENDOR_RC_SUCCESS regardless the wrapped function returned an error. BUG=b:79983505 BRANCH=cr50_vendor_cmd TEST=manual Issued vendor commands that were supposed to be ignored if they were from USB, expecting to have VENDOR_RC_NO_SUCH_COMMAND (127). (chroot) gsctool -w open_device 18d1:5014 found interface 3 endpoint 4, chunk_len 64 READY ------- Getting WP Error 127 getting write protect Change-Id: Ic07e81d278565005a50e5456e2bb4e436ebd5f96 Signed-off-by: Namyoon Woo <namyoon@google.com> Reviewed-on: https://chromium-review.googlesource.com/1103454 Commit-Ready: Namyoon Woo <namyoon@chromium.org> Tested-by: Namyoon Woo <namyoon@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--include/extension.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/extension.h b/include/extension.h
index 7ef43bc2a3..ed7dd70f32 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -72,7 +72,7 @@ struct extension_command {
{ \
func(params->buffer, params->in_size, \
&params->out_size); \
- return 0; \
+ return VENDOR_RC_SUCCESS; \
} \
const struct extension_command __keep __extension_cmd_##code \
__attribute__((section(".rodata.extensioncmds"))) \
@@ -83,9 +83,8 @@ struct extension_command {
static enum vendor_cmd_rc \
func##_wrap(struct vendor_cmd_params *params) \
{ \
- func(params->code, params->buffer, params->in_size, \
- &params->out_size); \
- return 0; \
+ return func(params->code, params->buffer, \
+ params->in_size, &params->out_size); \
} \
const struct extension_command __keep __vendor_cmd_##cmd_code \
__attribute__((section(".rodata.extensioncmds"))) \