Received: by 2002:a05:6a10:6d25:0:0:0:0 with SMTP id gq37csp1898999pxb; Mon, 13 Sep 2021 07:46:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwh+sGyJEyIO7GY4nyjTokrgN9AYWOtHJaOjy3Tct/fel2Hu73ErFwlSGC3+Wi6brITSq1d X-Received: by 2002:a5d:9693:: with SMTP id m19mr9552305ion.72.1631544414773; Mon, 13 Sep 2021 07:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631544414; cv=none; d=google.com; s=arc-20160816; b=MEb7JST+S4lhKqDMs6YycXGYFsx5sT6lSJ4rUPK+4BwrKcuHZ2Qe1++79VDGV10T+g lBS8j/mHO3wIOauXZb9qJL4ZcffjghLDtNfFHx4Vi1QPe/NGXWMnpelT8Xu0tepZZEnP spXNdRmHRI4Oe2J2Tg5Nv5wgi4WuzJfwbi/WDqQYBmGHwzoZBEqwJBflsOjcix9Xwg3c 3mdsl5pgNrjYuymwRvU8AxiZjXLdrf8AEPIPZdOOmRcFuwc3lfpOomEpxsQQrhqR40dL WSy6RtrvqQTxiELBcGMAtUOOI90tCap+/FRnTdXW7Ts29KqDSfRGUDK+8gZPzq3/rFZs dFpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yXmD5h91ZfBpDTzGUJh+sKPurP9iutA/drsKISurmys=; b=sfUMDLi7tdtloE98nxQ+kKzlkJx/6ppBXNrs43633husn5+FsLqZjtSufemBPR126J N/SG/VYO2OTlGKZo/7XxzPnBpNRsddU/GhwWTq5c7zPy6dB3YkIsWpgpVkF7hRl6S77q 2N8WejSyswmeOCp8NoN7YG873fsfkSA3aOtHGCghYCK+ldQaFbZf1MbuRxopYxL9oIiR o31aKBlCue88em6IZj9Xpg1yKrwmdJp7+mXXXN5gT40PIUoeqrC1jOY5LgHrYMBcVnm9 Upl3FEtj6k3Dbl/4L/cLTnftZr4UT4XkEwzWUqFDYAsMyLea3u2yzSH6mGYzHoDmycTW xaqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qv7ERLwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r19si6758565ilh.119.2021.09.13.07.46.41; Mon, 13 Sep 2021 07:46:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qv7ERLwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346692AbhIMOqW (ORCPT + 99 others); Mon, 13 Sep 2021 10:46:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:58820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347172AbhIMOkV (ORCPT ); Mon, 13 Sep 2021 10:40:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0BBCA61C19; Mon, 13 Sep 2021 13:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541356; bh=1b4fiQW4iHip8NCQtY7EijYtiIGCgeHDYDcgrGIcoJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qv7ERLwRWzVKrMyEyiD1jeCeItaRBeNiU/Ze080vF6LTTw7xhxKtk2cMhkCOAEpQ0 wXih5O1SyRB+hKfzwAb4syNKfehsgelIfglYvNh+Kbo5nwBuKk38X/bhztr11OHFmw yDywwm4TzFFJ9f+9d//IcUIMuu8l5yQmcp3DXpp4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Mark Brown , Sasha Levin Subject: [PATCH 5.14 265/334] ASoC: wcd9335: Fix a memory leak in the error handling path of the probe function Date: Mon, 13 Sep 2021 15:15:19 +0200 Message-Id: <20210913131122.373372214@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit fc6fc81caa63900cef9ebb8b2e365c3ed5a9effb ] If 'wcd9335_setup_irqs()' fails, me must release the memory allocated in 'wcd_clsh_ctrl_alloc()', as already done in the remove function. Add an error handling path and the missing 'wcd_clsh_ctrl_free()' call. Fixes: 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec") Signed-off-by: Christophe JAILLET Message-Id: <6dc12372f09fabb70bf05941dbe6a1382dc93e43.1629091028.git.christophe.jaillet@wanadoo.fr> Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wcd9335.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 933f59e4e56f..47fe68edea3a 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -4844,6 +4844,7 @@ static void wcd9335_codec_init(struct snd_soc_component *component) static int wcd9335_codec_probe(struct snd_soc_component *component) { struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); + int ret; int i; snd_soc_component_init_regmap(component, wcd->regmap); @@ -4861,7 +4862,15 @@ static int wcd9335_codec_probe(struct snd_soc_component *component) for (i = 0; i < NUM_CODEC_DAIS; i++) INIT_LIST_HEAD(&wcd->dai[i].slim_ch_list); - return wcd9335_setup_irqs(wcd); + ret = wcd9335_setup_irqs(wcd); + if (ret) + goto free_clsh_ctrl; + + return 0; + +free_clsh_ctrl: + wcd_clsh_ctrl_free(wcd->clsh_ctrl); + return ret; } static void wcd9335_codec_remove(struct snd_soc_component *comp) -- 2.30.2