From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753417AbbGWPT3 (ORCPT ); Thu, 23 Jul 2015 11:19:29 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:37893 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265AbbGWPTX (ORCPT ); Thu, 23 Jul 2015 11:19:23 -0400 Date: Thu, 23 Jul 2015 16:19:19 +0100 From: Lee Jones To: Christian Engelmayer Cc: olof@lixom.net, gwendal@chromium.org, wfrichar@chromium.org, smbarber@chromium.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mfd: cros_ec: Fix possible leak in led_rgb_store() Message-ID: <20150723151919.GM3436@x1> References: <1437334982-3388-1-git-send-email-cengelma@gmx.at> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1437334982-3388-1-git-send-email-cengelma@gmx.at> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 19 Jul 2015, Christian Engelmayer wrote: > 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(-) This is not an MFD patch. > 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; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog