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=-14.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SIGNED_OFF_BY,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 813F0C43381 for ; Wed, 27 Mar 2019 18:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 485882070B for ; Wed, 27 Mar 2019 18:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553712123; bh=QVFDIudWL+X+ctM+jjBIbGacnjvdIZPNuX4KiuNA4sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LU0H5qZPK25DUSSuLfy+2kcY1yeInla3Q41mEqHlm455Zg1c7hSrFL7Vsw60uar3G hd5+hrh/lRSjr4qbblGU3wZCW4e8NPR1oYOSvtL2rnw+ymkBWrVfDKW9iLiyYxP8XS /lBjVDQ9dnZu82mPO1MXuEX4UTFFknkjBfv4VGDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390745AbfC0SWN (ORCPT ); Wed, 27 Mar 2019 14:22:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391023AbfC0SWK (ORCPT ); Wed, 27 Mar 2019 14:22:10 -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 91D8320651; Wed, 27 Mar 2019 18:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710930; bh=QVFDIudWL+X+ctM+jjBIbGacnjvdIZPNuX4KiuNA4sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cwXxeDB9i8l1t3pac159skOv3L0nyFkQSsTW6nfd6AwZLTJoL9sIDwtGFtHFEQ72s gjhhgsqmQzAyxxNtsXbC7F3ZIkohsmi/8XnQYvqLUY4xygrskj7w+5Ux7lA1rjn/VD klmUWHPaK0zqE7ofB9js8xPxlSBgzTWBFsLSHrRU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ranjani Sridharan , Pierre-Louis Bossart , Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 4.9 50/87] ALSA: PCM: check if ops are defined before suspending PCM Date: Wed, 27 Mar 2019 14:20:03 -0400 Message-Id: <20190327182040.17444-50-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327182040.17444-1-sashal@kernel.org> References: <20190327182040.17444-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ranjani Sridharan [ Upstream commit d9c0b2afe820fa3b3f8258a659daee2cc71ca3ef ] BE dai links only have internal PCM's and their substream ops may not be set. Suspending these PCM's will result in their ops->trigger() being invoked and cause a kernel oops. So skip suspending PCM's if their ops are NULL. [ NOTE: this change is required now for following the recent PCM core change to get rid of snd_pcm_suspend() call. Since DPCM BE takes the runtime carried from FE while keeping NULL ops, it can hit this bug. See details at: https://github.com/thesofproject/linux/pull/582 -- tiwai ] Signed-off-by: Ranjani Sridharan Signed-off-by: Pierre-Louis Bossart Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/pcm_native.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 3586ab41dec4..4719f7f42aa8 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1339,6 +1339,14 @@ int snd_pcm_suspend_all(struct snd_pcm *pcm) /* FIXME: the open/close code should lock this as well */ if (substream->runtime == NULL) continue; + + /* + * Skip BE dai link PCM's that are internal and may + * not have their substream ops set. + */ + if (!substream->ops) + continue; + err = snd_pcm_suspend(substream); if (err < 0 && err != -EBUSY) return err; -- 2.19.1