From patchwork Thu Jan 23 21:32:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Engelmayer X-Patchwork-Id: 313741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45EAC2C0091 for ; Fri, 24 Jan 2014 08:32:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752578AbaAWVcX (ORCPT ); Thu, 23 Jan 2014 16:32:23 -0500 Received: from mout.gmx.net ([212.227.15.15]:57067 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564AbaAWVcW (ORCPT ); Thu, 23 Jan 2014 16:32:22 -0500 Received: from spike ([81.217.122.98]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0M2FhY-1VGgi10ofE-00s7sg for ; Thu, 23 Jan 2014 22:32:21 +0100 Date: Thu, 23 Jan 2014 22:32:20 +0100 From: Christian Engelmayer To: Milo Kim , Thierry Reding Cc: linux-pwm@vger.kernel.org Subject: [PATCH] pwm: lp3943: Fix potential memory leak during request Message-ID: <20140123223220.7d68b5f6@spike> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.20; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Provags-ID: V03:K0:uJhRExYKVDuuiFlqlqgck5WFX9Z7LhMr2iysV1BI7aGvGtmRmUj EtxO3XIrazyab+lAJut8UBBPyd2P8E0h++pw/Xx4LVAHcBoNfHjF1K8nrxKtCnh8az5ICRq lPM5pvxgRf91u3zw+L9Aso8umhlQtNEnGSvD0DJAH+M6CLRMjbJjGte14wSs41vvLBPFDFA usrD1Nry+RVyV80iOBO7w== Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Fix a memory leak in the lp3943_pwm_request_map() error handling path. Make sure already allocated pwm map memory is freed correctly. Detected by Coverity: CID 1162829. Signed-off-by: Christian Engelmayer Acked-by: Milo Kim Acked-by: Thierry Reding --- drivers/pwm/pwm-lp3943.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-lp3943.c b/drivers/pwm/pwm-lp3943.c index 8a843a0..a40b9c3 100644 --- a/drivers/pwm/pwm-lp3943.c +++ b/drivers/pwm/pwm-lp3943.c @@ -52,8 +52,10 @@ lp3943_pwm_request_map(struct lp3943_pwm *lp3943_pwm, int hwpwm) offset = pwm_map->output[i]; /* Return an error if the pin is already assigned */ - if (test_and_set_bit(offset, &lp3943->pin_used)) + if (test_and_set_bit(offset, &lp3943->pin_used)) { + kfree(pwm_map); return ERR_PTR(-EBUSY); + } } return pwm_map;