diff options
| author | Christian Engelmayer <cengelma@gmx.at> | 2015-07-19 21:43:02 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-07 23:34:26 +0200 |
| commit | f14ae099bdad32414ad968909973bfade9b37967 (patch) | |
| tree | cee31a38b49fd797fc57fc2aae48f82e58b2019c /drivers/platform | |
| parent | platform/chrome: cros_ec: Fix leak in sequence_store() (diff) | |
| download | linux-f14ae099bdad32414ad968909973bfade9b37967.tar.xz linux-f14ae099bdad32414ad968909973bfade9b37967.zip | |
platform/chrome: cros_ec: Fix possible leak in led_rgb_store()
Function led_rgb_store() contains some direct returns in error cases that
leak the already allocated cros_ec_command message structure. Make sure
that 'msg' is freed in all exit paths. Detected by Coverity CID 1309666.
Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_lightbar.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c index fc30a991b738..ff7640575c75 100644 --- a/drivers/platform/chrome/cros_ec_lightbar.c +++ b/drivers/platform/chrome/cros_ec_lightbar.c @@ -252,7 +252,7 @@ static ssize_t led_rgb_store(struct device *dev, struct device_attribute *attr, ret = sscanf(buf, "%i", &val[i++]); if (ret == 0) - return -EINVAL; + goto exit; if (i == 4) { param = (struct ec_params_lightbar *)msg->data; @@ -268,17 +268,15 @@ static ssize_t led_rgb_store(struct device *dev, struct device_attribute *attr, if ((j++ % 4) == 0) { ret = lb_throttle(); if (ret) - return ret; + goto exit; } ret = cros_ec_cmd_xfer(ec->ec_dev, msg); if (ret < 0) goto exit; - if (msg->result != EC_RES_SUCCESS) { - ret = -EINVAL; + if (msg->result != EC_RES_SUCCESS) goto exit; - } i = 0; ok = 1; |