From patchwork Tue Feb 18 19:54:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 231116 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5D551C34049 for ; Tue, 18 Feb 2020 20:05:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DEAA21D56 for ; Tue, 18 Feb 2020 20:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056326; bh=m5DX8gbNn2LYAQ6ON+TrHhlZmgkiUPrhN0fjPaqhjnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UN5DcLJTMbR3Jwf4Omn/e5TUIaf7vmvvvorapZMxCojILqu1xtqquIah9DdZURR15 gCCAfwT1cR6GEsh9FOO88Z3ymtuwbetaqOWWZKbPCbVWdaugtofdHWfnICRqsDiWls 2s4l1kED3obEWXEaQfnY1gEKBBWo80KAsL53qOLo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728827AbgBRUBv (ORCPT ); Tue, 18 Feb 2020 15:01:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:41554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728820AbgBRUBs (ORCPT ); Tue, 18 Feb 2020 15:01:48 -0500 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 2C4292465D; Tue, 18 Feb 2020 20:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582056107; bh=m5DX8gbNn2LYAQ6ON+TrHhlZmgkiUPrhN0fjPaqhjnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AEbjcPTVE50za0/5+NAI9a8VjFbP7mf0saXGPTBpzdYi0JBsHUWHAvJ1kr2GwFVcq h9bxLDaYoqJUlvcjWd73aqEC3luXBHFJOL4FV8FZgBwITPPwWDCjKb2gnY67GDnYaR p4HevF/84bKyCNEW2qFZ50jYr12Tt2waabvu9cqE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bard Liao , Pierre-Louis Bossart , Takashi Iwai Subject: [PATCH 5.5 08/80] ALSA: pcm: Fix double hw_free calls Date: Tue, 18 Feb 2020 20:54:29 +0100 Message-Id: <20200218190432.872521894@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200218190432.043414522@linuxfoundation.org> References: <20200218190432.043414522@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Iwai commit 0fbb027b44e79700da80e4b8bd1c1914d4796af6 upstream. The commit 66f2d19f8116 ("ALSA: pcm: Fix memory leak at closing a stream without hw_free") tried to fix the regression wrt the missing hw_free call at closing without SNDRV_PCM_IOCTL_HW_FREE ioctl. However, the code change dropped mistakenly the state check, resulting in calling hw_free twice when SNDRV_PCM_IOCTL_HW_FRE got called beforehand. For most drivers, this is almost harmless, but the drivers like SOF show another regression now. This patch adds the state condition check before calling do_hw_free() at releasing the stream for avoiding the double hw_free calls. Fixes: 66f2d19f8116 ("ALSA: pcm: Fix memory leak at closing a stream without hw_free") Reported-by: Bard Liao Reported-by: Pierre-Louis Bossart Tested-by: Pierre-Louis Bossart Cc: Link: https://lore.kernel.org/r/s5hd0ajyprg.wl-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2474,7 +2474,8 @@ void snd_pcm_release_substream(struct sn snd_pcm_drop(substream); if (substream->hw_opened) { - do_hw_free(substream); + if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) + do_hw_free(substream); substream->ops->close(substream); substream->hw_opened = 0; }