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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46741C433FE for ; Tue, 9 Nov 2021 22:33:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E41A6109F for ; Tue, 9 Nov 2021 22:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344967AbhKIWfz (ORCPT ); Tue, 9 Nov 2021 17:35:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:55866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345208AbhKIWdi (ORCPT ); Tue, 9 Nov 2021 17:33:38 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EB4561ACF; Tue, 9 Nov 2021 22:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496506; bh=TIJ+vD1aPoa35CzXFWMlwjwUNUfZNddnOajKeY74Lao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXiVo+6ZPIZ/+MJ5AeUOV13LBXE5XWZ01QLpVKtJWUtO+At/CBsyog10uY0y6Tk2x 4smEYjbMT+HrxkEIp3GFqDaxJ2ll16GA6TSFhDtfnVZZvQA0SJJ3+YekcGTQ3DSPCo qvWJ9TCFriKnjbH0Yizc2VTAiMXVe3JrqZIzMzMIFSLF2a2RXZnvOZNj6HiW1Go5ML NAQ+FZd1isnkv4CmUZnMDmQJQIJJrhRRqG9DIXnz4+3WdPxC1gAliWn18DxOloXYJ9 zN+FSYyD3MpovTOY9fL5/iXwyChU4rlbAAJAhGKdujhOrN7dzcB88OBFlJ4VxxwJ8W JSvA6xmvKx60w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pierre-Louis Bossart , Mark Brown , Takashi Iwai , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.10 25/50] ASoC: SOF: Intel: hda-dai: fix potential locking issue Date: Tue, 9 Nov 2021 17:20:38 -0500 Message-Id: <20211109222103.1234885-25-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109222103.1234885-1-sashal@kernel.org> References: <20211109222103.1234885-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit a20f3b10de61add5e14b6ce4df982f4df2a4cbbc ] The initial hdac_stream code was adapted a third time with the same locking issues. Move the spin_lock outside the loops and make sure the fields are protected on read/write. Signed-off-by: Pierre-Louis Bossart Acked-by: Mark Brown Link: https://lore.kernel.org/r/20210924192417.169243-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/soc/sof/intel/hda-dai.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index c6cb8c212eca5..ef316311e959a 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -68,6 +68,7 @@ static struct hdac_ext_stream * return NULL; } + spin_lock_irq(&bus->reg_lock); list_for_each_entry(stream, &bus->stream_list, list) { struct hdac_ext_stream *hstream = stream_to_hdac_ext_stream(stream); @@ -107,12 +108,12 @@ static struct hdac_ext_stream * * is updated in snd_hdac_ext_stream_decouple(). */ if (!res->decoupled) - snd_hdac_ext_stream_decouple(bus, res, true); - spin_lock_irq(&bus->reg_lock); + snd_hdac_ext_stream_decouple_locked(bus, res, true); + res->link_locked = 1; res->link_substream = substream; - spin_unlock_irq(&bus->reg_lock); } + spin_unlock_irq(&bus->reg_lock); return res; } -- 2.33.0