summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2019-08-27 16:36:20 +0200
committerCommit Bot <commit-bot@chromium.org>2019-08-28 08:45:09 +0000
commit54146077fc1ed898b7858faf1665ac39d872cf8f (patch)
tree06fc78b84d17d61d6dda524a3e2b89899bad85e9
parent9380ae9ffe98639058c487821a90cbe3bde614f2 (diff)
downloadchrome-ec-54146077fc1ed898b7858faf1665ac39d872cf8f.tar.gz
util/ectool: Protect against out-of-memory condition
Found by Coverity Scan BUG=none BRANCH=none TEST=none Change-Id: I9c29f915a732e8dc762b6ebcdffda6f433e983c2 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1768652 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
-rw-r--r--util/ectool.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/util/ectool.c b/util/ectool.c
index 86cc368eb9..ff07a678e0 100644
--- a/util/ectool.c
+++ b/util/ectool.c
@@ -8656,9 +8656,14 @@ int cmd_tp_frame_get(int argc, char* argv[])
data = malloc(ec_max_insize);
r = malloc(ec_max_insize);
+ if (data == NULL || r == NULL) {
+ fprintf(stderr, "Couldn't allocate memory.\n");
+ return EC_ERROR_UNKNOWN;
+ }
+
rv = ec_command(EC_CMD_TP_FRAME_INFO, 0, NULL, 0, r, ec_max_insize);
if (rv < 0) {
- fprintf(stderr, "Failed to get toucpad frame info.\n");
+ fprintf(stderr, "Failed to get touchpad frame info.\n");
goto err;
}