]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
platform/chrome: cros_ec: Fix possible leak in led_rgb_store()
authorChristian Engelmayer <cengelma@gmx.at>
Sun, 19 Jul 2015 19:43:02 +0000 (21:43 +0200)
committerOlof Johansson <olof@lixom.net>
Wed, 7 Oct 2015 21:34:26 +0000 (14:34 -0700)
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>
drivers/platform/chrome/cros_ec_lightbar.c

index fc30a991b738f5326b164d30ff8ce272f10d7e0a..ff7640575c751dfbc401486eee0f982c3527b1ff 100644 (file)
@@ -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;