diff options
| author | Christian Engelmayer <cengelma@gmx.at> | 2015-07-19 15:43:02 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-07 17:34:26 -0400 |
| commit | f14ae099bdad32414ad968909973bfade9b37967 (patch) | |
| tree | cee31a38b49fd797fc57fc2aae48f82e58b2019c /drivers/platform/chrome | |
| parent | 88dfb8b43d557ee9b1c1ffd2c8d275dd479a66d4 (diff) | |
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/chrome')
| -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, | |||
| 252 | 252 | ||
| 253 | ret = sscanf(buf, "%i", &val[i++]); | 253 | ret = sscanf(buf, "%i", &val[i++]); |
| 254 | if (ret == 0) | 254 | if (ret == 0) |
| 255 | return -EINVAL; | 255 | goto exit; |
| 256 | 256 | ||
| 257 | if (i == 4) { | 257 | if (i == 4) { |
| 258 | param = (struct ec_params_lightbar *)msg->data; | 258 | param = (struct ec_params_lightbar *)msg->data; |
| @@ -268,17 +268,15 @@ static ssize_t led_rgb_store(struct device *dev, struct device_attribute *attr, | |||
| 268 | if ((j++ % 4) == 0) { | 268 | if ((j++ % 4) == 0) { |
| 269 | ret = lb_throttle(); | 269 | ret = lb_throttle(); |
| 270 | if (ret) | 270 | if (ret) |
| 271 | return ret; | 271 | goto exit; |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | ret = cros_ec_cmd_xfer(ec->ec_dev, msg); | 274 | ret = cros_ec_cmd_xfer(ec->ec_dev, msg); |
| 275 | if (ret < 0) | 275 | if (ret < 0) |
| 276 | goto exit; | 276 | goto exit; |
| 277 | 277 | ||
| 278 | if (msg->result != EC_RES_SUCCESS) { | 278 | if (msg->result != EC_RES_SUCCESS) |
| 279 | ret = -EINVAL; | ||
| 280 | goto exit; | 279 | goto exit; |
| 281 | } | ||
| 282 | 280 | ||
| 283 | i = 0; | 281 | i = 0; |
| 284 | ok = 1; | 282 | ok = 1; |
