Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Christian Engelmayer Newsgroups: linux.kernel Subject: [PATCH] mfd: cros_ec: Fix possible leak in led_rgb_store() Date: Sun, 19 Jul 2015 21:50:02 +0200 Message-ID: X-Original-To: olof@lixom.net X-Mailer: git-send-email 1.9.1 X-Provags-ID: V03:K0:0xB4Ko/pXTZTz0MQOjy8Fc8I2rHtFWCi+t7Z1bouEHAJRgik/kG DB1uutyGiD8xXtM9RqFnq0ROvQgDZIAXYTGHUIbVI8ZBD/EGuOnpgbkd/LJP3K4aGwpwwsq +py1wgZ4IT4eOjh4gjvvxc25x9d+2sZMeVwAi1bxrQknOJXwtqfB7ihAGjjMu25UwA1Olm6 DB35h6MPYsAzHFzU78KUA== X-Ui-Out-Filterresults: notjunk:1;V01:K0:+FUPO72YS88=:hxe2cZEsw8W5Rla97/uPLY iQIIZYk5hGwMu3RauEVMmijwVhfYsqzpmgBWpln6HpkfC/8iMJ4J1eK66fM/HV2+bUa+TiDU2 p/ITfy94lYcK23HNM4djuTksl2mRt1tQ6oe0lE5RMTRxkTokXxRLHhqQu09zuvR90GW3YkiWp +vnjNSAqAFnSqE4mrISSLnO4u9tVEn5t6jY/C9lv70Qvu3+MOO9yWL7ZWVxgv+sn6Ehgnj569 87zSkWC9k1zkQg/hSnhEueDxCkCQKjWbZYdct+LgrZz3wAvGekv1g45NqzO9GRCxCS2Xc3GQj Sa4R6BIFp8XH6Xiyu1ElmNUPxwiFRh6kU+NXWKjdzQ0BI59rf/uS5QrSXIADUrz0160KMy25F Gu9+C2kyFdJtPqQQQZ5v8srcfDP57bUmmkrOHtGufZ2cnil2G8TWkceYFoaSTWbSq3SDor/F5 zsMJ0ay9rEuhkFGcOadIyfaHutvnczke+sTUb73ZKeSdmgx1ceBlNyKgXK8H1s2ZvbtXww1rK KWLfKwlHe3vUoXZS55bFS0LWitLWSqDMjZcHV2ZRp4ZrVqwnjLztugBQMogtE3DQ4JHJNGITI r5wD8pDEbGS2kB4p4qYLwYm7LAiyrzoMKNUzTOA6MkA4QRk9Vm47PxEgzQcOYaRBcdY+JOF8w 7dDpyZmnG6AD56XBuVtCRv9Z7JSFL4nL93GpejQnv0Y5d/Q== Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 52 Organization: linux.* mail to news gateway X-Original-Cc: lee.jones@linaro.org, gwendal@chromium.org, wfrichar@chromium.org, smbarber@chromium.org, linux-kernel@vger.kernel.org, Christian Engelmayer X-Original-Date: Sun, 19 Jul 2015 21:43:02 +0200 X-Original-Message-ID: <1437334982-3388-1-git-send-email-cengelma@gmx.at> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: aioe.org linux.kernel:1187866 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 --- Compile tested only. Applies against linux-next. --- drivers/platform/chrome/cros_ec_lightbar.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c index 144e09df9b84..4e598c11e8a4 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; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/