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 E812D38DD8; Mon, 1 Apr 2024 16:37:51 +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=1711989472; cv=none; b=Ikoq1X2+4TwdK+tlWKhKrjGLP3OUarArCauTsL5TbxGYwql9IM9AGyviIBSdvEFMmyEIDGzaiHG5HJG4PM1w4JvWYskBdTksV4waMa7hpZIKTJh1+JZHgIDbT5StuinIm/MpneRmare1guLamFJwVXgwp2P0u6EQbvKUkAv35i8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711989472; c=relaxed/simple; bh=j5vHoVnODiCffhk7BgoLJNeMRN3k/u/d0UWgJnOl13g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VzQ6NsTr9QZP3L3vIhqEXSEdFg2FuwScXK5FBvvRVqgGO5J4LbBnJWH+KceJlobuMdbwmARjC1jOYuwbZlcOubIQzWC1Ttg+BfCQFqoZ9N647Fg0LoNsLYaRkdpb5MQvT9p4fhiPBg7Ep444s4FXjAc6eB8NboZm2za5aqhXQjc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E/CimBdv; 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="E/CimBdv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05E54C433F1; Mon, 1 Apr 2024 16:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711989471; bh=j5vHoVnODiCffhk7BgoLJNeMRN3k/u/d0UWgJnOl13g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E/CimBdvGkGO9L/3EsNpR3hp6bXzqCzO9/3ixdVMbB8kR/aNGUvfR8E7lziW1oG3t KKggqAENnXh1yGIL2ALf0Ufn01lH19/B7K/Vqd0/92gQMluC9OQTBsfoKrfRCjXf+I hBtmz4vlEuTkioItRY/0PDXTJ4BWeHJX2AHIxfdY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Rui , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.6 030/396] powercap: intel_rapl: Fix a NULL pointer dereference Date: Mon, 1 Apr 2024 17:41:19 +0200 Message-ID: <20240401152548.804256385@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152547.867452742@linuxfoundation.org> References: <20240401152547.867452742@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Zhang Rui [ Upstream commit 2d1f5006ff95770da502f8cee2a224a1ff83866e ] A NULL pointer dereference is triggered when probing the MMIO RAPL driver on platforms with CPU ID not listed in intel_rapl_common CPU model list. This is because the intel_rapl_common module still probes on such platforms even if 'defaults_msr' is not set after commit 1488ac990ac8 ("powercap: intel_rapl: Allow probing without CPUID match"). Thus the MMIO RAPL rp->priv->defaults is NULL when registering to RAPL framework. Fix the problem by adding sanity check to ensure rp->priv->rapl_defaults is always valid. Fixes: 1488ac990ac8 ("powercap: intel_rapl: Allow probing without CPUID match") Signed-off-by: Zhang Rui Cc: 6.5+ # 6.5+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/powercap/intel_rapl_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 2feed036c1cd4..1a739afd47d96 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -759,6 +759,11 @@ static int rapl_config(struct rapl_package *rp) default: return -EINVAL; } + + /* defaults_msr can be NULL on unsupported platforms */ + if (!rp->priv->defaults || !rp->priv->rpi) + return -ENODEV; + return 0; } -- 2.43.0