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 3E236C282E1 for ; Wed, 24 Apr 2019 18:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C81D20685 for ; Wed, 24 Apr 2019 18:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556129639; bh=0tUTPvqP0a2t8MKMt5Jfg3gDx+a0gEWJ9njEoAvvJWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EsqAmR75WXn/i5jtJqW6TaioJoeYf3ftNgQRr3922fW7WMXrWOk1XjdLSiZs9jjFQ v79wQb4oRVEMiHXm5JkP8lrW6G5WNDJwcsVNXZpX6lss/RfTblBII483WZcWNwDB48 hsm5uoeWJeNo4EUjRyejfDCxElK29uFMZWC7AxiM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387995AbfDXSN5 (ORCPT ); Wed, 24 Apr 2019 14:13:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387445AbfDXRLo (ORCPT ); Wed, 24 Apr 2019 13:11:44 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 6B40021900; Wed, 24 Apr 2019 17:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556125903; bh=0tUTPvqP0a2t8MKMt5Jfg3gDx+a0gEWJ9njEoAvvJWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dETI9046vadTkszYABU5fJi+1tOSB1JRrQKI7bYolfaT7mIYR0o0bwv6O7QzHOwh3 vvWh/ozygAepHqZqCXbbvFDLZ8vsOObxXNvjy1VOmaOlKfkcRmLh8Jd+W7z2Vu2Pih +j0nDDNy3DlogGg9MKq+k7gY7T/eOf3ud3z3Hi98= 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 3.18 024/104] ALSA: PCM: check if ops are defined before suspending PCM Date: Wed, 24 Apr 2019 19:08:41 +0200 Message-Id: <20190424170854.401138101@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170839.996641496@linuxfoundation.org> References: <20190424170839.996641496@linuxfoundation.org> User-Agent: quilt/0.66 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 [ 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 a79edb3e8284..29a088e03657 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1315,6 +1315,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