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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5AFAC71153 for ; Mon, 28 Aug 2023 10:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230489AbjH1KXT (ORCPT ); Mon, 28 Aug 2023 06:23:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231284AbjH1KWo (ORCPT ); Mon, 28 Aug 2023 06:22:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 865BD83 for ; Mon, 28 Aug 2023 03:22:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6550863914 for ; Mon, 28 Aug 2023 10:22:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A50EC433C8; Mon, 28 Aug 2023 10:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1693218159; bh=3XosIgii8qlwt+LNDIt8DHXWRLNvhJShUlQe0WY5AAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tkPMZdSp3GzJAVfinXgO6avC4U2AVm1NyE72TW91bGo1hdfqySELVaRDZh2PBueT0 vSbFENnz///Pjja98cajd1GES+ObdoIeFcDEFvm75WO3HsbuWZaeLWWpx/jvzsD5OP /elp5eywShzuf8hVk1jsRcF0bzxJXDc0OFB1FJ1A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chao Song , Bard Liao , Pierre-Louis Bossart , Peter Ujfalusi , Mark Brown , Sasha Levin Subject: [PATCH 6.4 117/129] ASoC: SOF: ipc4-pcm: fix possible null pointer deference Date: Mon, 28 Aug 2023 12:13:16 +0200 Message-ID: <20230828101201.263230293@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230828101157.383363777@linuxfoundation.org> References: <20230828101157.383363777@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chao Song [ Upstream commit 2d218b45848b92b03b220bf4d9bef29f058f866f ] The call to snd_sof_find_spcm_dai() could return NULL, add nullable check for the return value to avoid null pointer defenrece. Fixes: 7cb19007baba ("ASoC: SOF: ipc4-pcm: add hw_params") Signed-off-by: Chao Song Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20230816133311.7523-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/ipc4-pcm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c index 9e2b6c45080dd..49eb98605518a 100644 --- a/sound/soc/sof/ipc4-pcm.c +++ b/sound/soc/sof/ipc4-pcm.c @@ -708,6 +708,9 @@ static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component, struct snd_sof_pcm *spcm; spcm = snd_sof_find_spcm_dai(component, rtd); + if (!spcm) + return -EINVAL; + time_info = spcm->stream[substream->stream].private; /* delay calculation is not supported by current fw_reg ABI */ if (!time_info) -- 2.40.1