Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1762404ybz; Sat, 18 Apr 2020 07:59:45 -0700 (PDT) X-Google-Smtp-Source: APiQypI8oDG8p5ycrlVgSQxMGRviwOF2Pu7Sx0kAEDWFvtLYYH3Lb2yQDUkIN1VQcA+GknvOUimm X-Received: by 2002:a05:6402:30ad:: with SMTP id df13mr6972343edb.339.1587221985036; Sat, 18 Apr 2020 07:59:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221985; cv=none; d=google.com; s=arc-20160816; b=etVBWnnPyIrxZdd+oZgOqb03/4Nhb82zirpv2OaYXgeEqkiC2VVKDCC2VyOmSF0fKC dPCP2yw24p7p8zmCFaDbrpgAvOwv7RbLLgaLiOwXSb2fXXv0Eqd1vfWfZP0elUWcCdqy F+0s+NlBRJa2b84lq0GfGF91ImJvgHO3PkCejQdgW70Xu92g7e6hz+L+2IYED9C4nukc 3YfYtKJoGzg0ZbGol3bBWjSoZ50tfIDrDim9IibVxwGkZQhmrAUaucz/ofrya3umAcG0 wqh5rqXonA3OFtfMDlWU9qd3DQrrBCX8R8Ql4J9XBQR/raPz4ZygvivHDJxLkf/hIKxT knsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2UL7NPQPbRLQ+GIDaCzAR9bdMWwVXrF2MrryKLfp6ss=; b=w9P+Mja+y3DTgXRmZ+ulzW8g/49cipSg90g4v2xLC3spUVveUOmGKMkd49UhjYBumr mN8Zx7/UGET0lmd6TeXsly0cSNXVvOhs/VrfUg3J8qxsdtvkzi43ZgYkpleGHaU5XD4c 7VN9YNXKxj5O67gNuNNyMDE9YKhlg8pROROGaTZqeGOMvIoAS/1YmPxLf9t1zlpUUbWu W/K4u9d7RpDLsAyXdNDiEqzy04lfDI2STgdVefNqzyTU+PwWEYGQxut6/cKQVDSf6jWv UgtIXd1022Z0XGs/bdbBph1ccDNFhgdLAqdYVML0+6vFfwyroBMPqpWMeggU0tHKbeeO GnXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v+JTI84T; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dx16si16059286ejb.532.2020.04.18.07.59.22; Sat, 18 Apr 2020 07:59:45 -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=@kernel.org header.s=default header.b=v+JTI84T; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727818AbgDROlN (ORCPT + 99 others); Sat, 18 Apr 2020 10:41:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:49992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726471AbgDROlL (ORCPT ); Sat, 18 Apr 2020 10:41:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34B442220A; Sat, 18 Apr 2020 14:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220871; bh=1RYs4Lz/2BnS7f8Vf4aqmZgljBRSOk3rbVPrrg1Tko4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v+JTI84TmsJ8Cq1KveSfFt9FcY9roYXoCxTJ2WfQPd0TpdXb/kkpJCsIA+OYkxD7t bsUWdnumwxLR5GUP01X+45QQb75l/2nBVrIASm1hn8yWOtW4hZ36fJjSVIYoMVRKc+ f7tigYuq8uBJhHoxXFdTPpFoizmWkicXMtJBU9/o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Pierre-Louis Bossart , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 19/78] ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() Date: Sat, 18 Apr 2020 10:39:48 -0400 Message-Id: <20200418144047.9013-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit 81630dc042af998b9f58cd8e2c29dab9777ea176 ] sst_send_slot_map() uses sst_fill_and_send_cmd_unlocked() because in some places it is called with the drv->lock mutex already held. So it must always be called with the mutex locked. This commit adds missing locking in the sst_set_be_modules() code-path. Fixes: 24c8d14192cc ("ASoC: Intel: mrfld: add DSP core controls") Signed-off-by: Hans de Goede Acked-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200402185359.3424-1-hdegoede@redhat.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index baef461a99f19..2c3798034b1de 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -966,7 +966,9 @@ static int sst_set_be_modules(struct snd_soc_dapm_widget *w, dev_dbg(c->dev, "Enter: widget=%s\n", w->name); if (SND_SOC_DAPM_EVENT_ON(event)) { + mutex_lock(&drv->lock); ret = sst_send_slot_map(drv); + mutex_unlock(&drv->lock); if (ret) return ret; ret = sst_send_pipe_module_params(w, k); -- 2.20.1