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 29F562550B2; Tue, 29 Apr 2025 18:11:28 +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=1745950288; cv=none; b=Dtvx2iEX0ZXtZ027XqZR1IRGmXWZBO7Rf+W7hpzPhKTWxLOW+KJGxblZpRPyikUU0QM1J7Zf0r4wvrkgA8xotlkxv7tzKVDlH9KRVYx0PVqDiI7fzVSMKl97Dqwa0NVSfn0eQMe9iEZlc8YN0utxHqLAHmqkRmpu1IIb+Sg/cUg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950288; c=relaxed/simple; bh=zjbITz/2efdp2bcEyp2C+99e+KNgRtHecN3fVyIubnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gMM+PlIGYTqve7sj1QstUNtOscBK+fYrS1u8l9AdUzccaGn1le62KkXaF8g/r2+PC4seAayTu5qF3QINY80Ho5Q7g6oLoVE+wpAVKJe13z0iW6OnEfbR9t4f+nHwqQbh7Y6UCR8x1G8v7gdQAoqav8aHj8CkKUDlo9jqzq2F4xc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=meptvIPJ; 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="meptvIPJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E7E4C4CEE3; Tue, 29 Apr 2025 18:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745950288; bh=zjbITz/2efdp2bcEyp2C+99e+KNgRtHecN3fVyIubnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=meptvIPJp7ppTGWkSN5SFLArSO7lNwHAQAtujfuD8VnXzQv+BV8eudWETyUaAvqPF FiTyDOrZPKqc8ExEL22lJDVrYmbKLM+vUETs5cHBaRfacYJFi9mALB8b2eUstVfRpK ZRDSDaefMiWowM+yx6rPRmnx3ry1wtgz+Bg2qzvA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Henry Martin , Sudeep Holla , Viresh Kumar , Sasha Levin Subject: [PATCH 6.6 048/204] cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate() Date: Tue, 29 Apr 2025 18:42:16 +0200 Message-ID: <20250429161101.372764880@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161059.396852607@linuxfoundation.org> References: <20250429161059.396852607@linuxfoundation.org> User-Agent: quilt/0.68 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Henry Martin [ Upstream commit 484d3f15cc6cbaa52541d6259778e715b2c83c54 ] cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scmi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference. Add NULL check after cpufreq_cpu_get_raw() to prevent this issue. Fixes: 99d6bdf33877 ("cpufreq: add support for CPU DVFS based on SCMI message protocol") Signed-off-by: Henry Martin Acked-by: Sudeep Holla Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/cpufreq/scmi-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c index 079940c69ee0b..e4989764efe2a 100644 --- a/drivers/cpufreq/scmi-cpufreq.c +++ b/drivers/cpufreq/scmi-cpufreq.c @@ -33,11 +33,17 @@ static const struct scmi_perf_proto_ops *perf_ops; static unsigned int scmi_cpufreq_get_rate(unsigned int cpu) { - struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu); - struct scmi_data *priv = policy->driver_data; + struct cpufreq_policy *policy; + struct scmi_data *priv; unsigned long rate; int ret; + policy = cpufreq_cpu_get_raw(cpu); + if (unlikely(!policy)) + return 0; + + priv = policy->driver_data; + ret = perf_ops->freq_get(ph, priv->domain_id, &rate, false); if (ret) return 0; -- 2.39.5