From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51EEE29D26D; Fri, 3 Oct 2025 16:07:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759507658; cv=none; b=E7HU3jEPx0Qsto9TueylnnmGMQ8tGwQ5g4FKBDOfMbGKohizdkjzeJpByABhX2fWeD0ADcBqBZIBBxlDjh/q655sMWDdPcE8KWBh8X5PitTb/FkaHJYrRebiGVERVgl1I5rNOV7gECdvvpDglfD7yUUybz/cHHemOTZ7yvFSHOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759507658; c=relaxed/simple; bh=TxSRzCksaHXRr4YSc/cfbDXU4E1vw5BhVnJ07UkANCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cI31aP94aKAAPM3T1Bxxc5XXbuZ7S3zPIkCY+rw91NQQwCotsJ6e5SuU1Lj4YRtzyNYLKsh1oOP8q4mXbKVDu7gJrGw2sd7ndwDmvEH3E9vArrSWtmXYKFcDXbWNY3GEkfd7D/aeGijTPI2PQBkqFUDAuyDhDJEW7DaHOjrTFDU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RxfZDOYB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RxfZDOYB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0332C4CEF5; Fri, 3 Oct 2025 16:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759507658; bh=TxSRzCksaHXRr4YSc/cfbDXU4E1vw5BhVnJ07UkANCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RxfZDOYBGNpCbvul3Ej3Zzu7axLP/LPRh02qMlrmA3d4oPGFEx6LVIdWeGEgZlkdg nXuO/YDscCSIHZPv0PgIQDaoSr19KqUlE1Do7/gx/4BUhFQkYVg7QkYH9++oOtamKe maWuUASTxCDvQJV4+3yMUav+qKYETM4qYwnAXhxg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Stable@vger.kernel.org, Srinivas Kandagatla , Mark Brown Subject: [PATCH 6.16 14/14] ASoC: qcom: audioreach: fix potential null pointer dereference Date: Fri, 3 Oct 2025 18:05:48 +0200 Message-ID: <20251003160353.116512020@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251003160352.713189598@linuxfoundation.org> References: <20251003160352.713189598@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Srinivas Kandagatla commit 8318e04ab2526b155773313b66a1542476ce1106 upstream. It is possible that the topology parsing function audioreach_widget_load_module_common() could return NULL or an error pointer. Add missing NULL check so that we do not dereference it. Reported-by: Dan Carpenter Cc: Stable@vger.kernel.org Fixes: 36ad9bf1d93d ("ASoC: qdsp6: audioreach: add topology support") Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20250825101247.152619-2-srinivas.kandagatla@oss.qualcomm.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/qcom/qdsp6/topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/soc/qcom/qdsp6/topology.c +++ b/sound/soc/qcom/qdsp6/topology.c @@ -587,8 +587,8 @@ static int audioreach_widget_load_module return PTR_ERR(cont); mod = audioreach_parse_common_tokens(apm, cont, &tplg_w->priv, w); - if (IS_ERR(mod)) - return PTR_ERR(mod); + if (IS_ERR_OR_NULL(mod)) + return mod ? PTR_ERR(mod) : -ENODEV; dobj = &w->dobj; dobj->private = mod;