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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 AFB68C10F0C for ; Thu, 4 Apr 2019 08:56:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80F32217D4 for ; Thu, 4 Apr 2019 08:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368203; bh=0MHYsO3JCUy7hTjVLCghAeKMp2/AsKktN63SAFXvits=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uRZ9d90d8MamfRB1wJ04anJKoiovrjdTVLX/kvFrnAbU4pREmWQEH4JfNbJFLzqln FcjSZcULBG4xNnfEXi1o53aFX/HRkYKk7Rk4PmhCVBw2BScj032kbqsiCTWE32qix8 7XgbySqbBJ2P/nIop59R/JzNoAJ9bqISnlalHKNI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730530AbfDDI4m (ORCPT ); Thu, 4 Apr 2019 04:56:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:60114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730515AbfDDI4j (ORCPT ); Thu, 4 Apr 2019 04:56:39 -0400 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 691FB21900; Thu, 4 Apr 2019 08:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368198; bh=0MHYsO3JCUy7hTjVLCghAeKMp2/AsKktN63SAFXvits=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pc4pIn+UiAgbOo30nc8yNM6/RN//TvZDYox5GKtsdr2FOfHuP+eiPsN33//BBzDzt usZz8AIBCtty3HoB59aHEKRSXCtcntu5Qipm2IcNYezbvMbLEq6of5YlfxEmU+SU+M Mt87KyKIGB+U+1o3VSuS1lWnZ/NOtWZP+boLhv4o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ranjani Sridharan , Pierre-Louis Bossart , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 073/121] ALSA: PCM: check if ops are defined before suspending PCM Date: Thu, 4 Apr 2019 10:47:41 +0200 Message-Id: <20190404084549.238420600@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084545.245659903@linuxfoundation.org> References: <20190404084545.245659903@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 1a63d456a3dc..182e4afd21eb 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1482,6 +1482,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