From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC0DBC433E5 for ; Mon, 24 Aug 2020 08:48:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F4F0204FD for ; Mon, 24 Aug 2020 08:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258926; bh=VEHsi2lvfwmOe5KZ6QdafMJpjIqDpBNCgokbpeJlJVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1XhhMaRPJAPiS8rVjx4yrCT2w71LQWKlsacaPVdB+wBDBJdlfqjU8vmrwgo6XLIQN ATd5/zuLVrB2gxeK6KiHOC7xbpWqYx761Gul2XO//TRvhCkAd4nfrPKEkNK/1qwDJc /hTYlmV87ngeCkq0KFu8rYvE3QT1vz8jGidSafq0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728004AbgHXIso (ORCPT ); Mon, 24 Aug 2020 04:48:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:49298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729538AbgHXIsT (ORCPT ); Mon, 24 Aug 2020 04:48:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C873A206F0; Mon, 24 Aug 2020 08:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258899; bh=VEHsi2lvfwmOe5KZ6QdafMJpjIqDpBNCgokbpeJlJVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QfYTVYSEan5ABQz/hbxvk8K+b/Uw1rjM6uuTIsJyG7Qx2tq2BigppoPA/wCgoUkMN xczZyMocwkKQeTsHVZZqgHkwbJ0kvSO1/bFWe7H1IVlkbGaReeBvjr5KbMmUCr6L4a PXvElcfuIjfMsVX/B2wYvOCbBXn/XFGljzWIIB0M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH 5.4 085/107] ASoC: intel: Fix memleak in sst_media_open Date: Mon, 24 Aug 2020 10:30:51 +0200 Message-Id: <20200824082409.328956134@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082405.020301642@linuxfoundation.org> References: <20200824082405.020301642@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit 062fa09f44f4fb3776a23184d5d296b0c8872eb9 ] When power_up_sst() fails, stream needs to be freed just like when try_module_get() fails. However, current code is returning directly and ends up leaking memory. Fixes: 0121327c1a68b ("ASoC: Intel: mfld-pcm: add control for powering up/down dsp") Signed-off-by: Dinghao Liu Acked-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200813084112.26205-1-dinghao.liu@zju.edu.cn Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 8cc3cc363eb03..31f1dd6541aa1 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -331,7 +331,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, ret_val = power_up_sst(stream); if (ret_val < 0) - return ret_val; + goto out_power_up; /* Make sure, that the period size is always even */ snd_pcm_hw_constraint_step(substream->runtime, 0, @@ -340,8 +340,9 @@ static int sst_media_open(struct snd_pcm_substream *substream, return snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); out_ops: - kfree(stream); mutex_unlock(&sst_lock); +out_power_up: + kfree(stream); return ret_val; } -- 2.25.1