diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2018-02-01 11:00:40 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-02-03 01:29:19 +0000 |
| commit | 0b84f505b6b3269b57c728c3fc04616307e4319a (patch) | |
| tree | 42d66e472df50eee077d8211f4830fd35a059678 | |
| parent | 8557630d22780f8882b35ec49cf9d3ba99529015 (diff) | |
| download | chrome-ec-0b84f505b6b3269b57c728c3fc04616307e4319a.tar.gz | |
ccd: fix scan-admin warnings
Automated code scanner highlighted a few problems in the recent ode
additions. This patch fixes the problems.
BRANCH=cr50
BUG=none
TEST=none
Change-Id: I1f199eb5d2af992384ab04f3010b4b646464a70f
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/897993
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 8dba841b4e4e514204f6e002115862fe3229666f)
Reviewed-on: https://chromium-review.googlesource.com/900167
| -rw-r--r-- | common/ccd_config.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/ccd_config.c b/common/ccd_config.c index 544ff33454..3e8165e97f 100644 --- a/common/ccd_config.c +++ b/common/ccd_config.c @@ -878,7 +878,8 @@ static int ccd_command_wrapper(int argc, char *password, * error code is the first byte after the header. */ return_code = be32toh(vch->tpm_header.command_code); - if (return_code && (return_code != VENDOR_RC_IN_PROGRESS)) { + if ((return_code != EC_SUCCESS) && + (return_code != VENDOR_RC_IN_PROGRESS)) { rv = vch->ccd_subcommand; } else { rv = EC_SUCCESS; @@ -1457,7 +1458,7 @@ static enum vendor_cmd_rc ccd_vendor(enum vendor_cmd_cc code, size_t input_size, size_t *response_size) { - enum vendor_cmd_rc (*handler)(void *x, size_t y, size_t *t); + enum vendor_cmd_rc (*handler)(void *x, size_t y, size_t *t) = NULL; char *buffer; enum vendor_cmd_rc rc; @@ -1523,7 +1524,7 @@ static enum vendor_cmd_rc ccd_disable_rma(enum vendor_cmd_cc code, size_t input_size, size_t *response_size) { - int rv; + int rv = EC_SUCCESS; int error_line; do { @@ -1555,6 +1556,7 @@ static enum vendor_cmd_rc ccd_disable_rma(enum vendor_cmd_cc code, CPRINTF("Capability %d is not present\n", required_capabilities[i]); error_line = __LINE__; + rv = EC_ERROR_ACCESS_DENIED; break; } } |