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=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 6461EC3B18B for ; Thu, 13 Feb 2020 13:32:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E282222C2 for ; Thu, 13 Feb 2020 13:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581600720; bh=Y/3200Xe91pK1588PjJBG4y3ejf01YSeXXgdUWVo2ug=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=1yC76+qH4i5HLsnPjRx6bp9gpjBxThTCmXoJMnBa5UiE810JfNcrpIZ1WXIGuhSfD gxOFz1EYt2inq6PDfOEaMw/n/gFqAhZZhosKgP7ZBhS6TPUQwATI7DSK1RtEv6zkuU 4A3w6BC7w0oaGx9QLIHY+0jgvUePmalbboWs7zlQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729948AbgBMNb7 (ORCPT ); Thu, 13 Feb 2020 08:31:59 -0500 Received: from foss.arm.com ([217.140.110.172]:46636 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729901AbgBMNb7 (ORCPT ); Thu, 13 Feb 2020 08:31:59 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 77F861FB; Thu, 13 Feb 2020 05:31:58 -0800 (PST) Received: from localhost (unknown [10.37.6.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E74B73F6CF; Thu, 13 Feb 2020 05:31:57 -0800 (PST) Date: Thu, 13 Feb 2020 13:31:56 +0000 From: Mark Brown To: Samuel Holland Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, Jaroslav Kysela , Jerome Brunet , Jonathan Corbet , Liam Girdwood , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown , Mark Rutland , Rob Herring , stable@vger.kernel.org, Takashi Iwai Subject: Applied "ASoC: codec2codec: avoid invalid/double-free of pcm runtime" to the asoc tree In-Reply-To: <20200213061147.29386-2-samuel@sholland.org> Message-Id: X-Patchwork-Hint: ignore Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The patch ASoC: codec2codec: avoid invalid/double-free of pcm runtime has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b6570fdb96edf45bcf71884bd2644bd73d348d1a Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Thu, 13 Feb 2020 00:11:44 -0600 Subject: [PATCH] ASoC: codec2codec: avoid invalid/double-free of pcm runtime The PCM runtime was freed during PMU in the case that the event hook encountered an error. However, it is also unconditionally freed during PMD. Avoid a double-free by dropping the call to kfree in the PMU hook. Fixes: a72706ed8208 ("ASoC: codec2codec: remove ephemeral variables") Cc: stable@vger.kernel.org Signed-off-by: Samuel Holland Link: https://lore.kernel.org/r/20200213061147.29386-2-samuel@sholland.org Signed-off-by: Mark Brown --- sound/soc/soc-dapm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index bc20ad9abf8b..8b24396675ec 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3916,9 +3916,6 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, runtime->rate = params_rate(params); out: - if (ret < 0) - kfree(runtime); - kfree(params); return ret; } -- 2.20.1