summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kandybka <d.kandybka@gmail.com>2025-01-24 01:07:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-22 12:56:45 -0700
commit824c80b2225ffe684fbf172077233dac6f99480d (patch)
tree0e4d75d74cbfa403ce25caef2e0b717ca188ce06
parent4ca543f613d6e7974d7d66cecd1f9400ff039342 (diff)
downloadlinux-824c80b2225ffe684fbf172077233dac6f99480d.tar.gz
linux-824c80b2225ffe684fbf172077233dac6f99480d.tar.bz2
linux-824c80b2225ffe684fbf172077233dac6f99480d.zip
platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show()
[ Upstream commit 583ef25bb2a094813351a727ddec38b35a15b9f8 ] In pmc_core_ltr_show(), promote 'val' to 'u64' to avoid possible integer overflow. Values (10 bit) are multiplied by the scale, the result of expression is in a range from 1 to 34,326,183,936 which is bigger then UINT32_MAX. Compile tested only. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Kandybka <d.kandybka@gmail.com> Reviewed-by: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20250123220739.68087-1-d.kandybka@gmail.com Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/platform/x86/intel/pmc/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index 3e7f99ac8c94..c5dae640a0b2 100644
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -625,8 +625,8 @@ static u32 convert_ltr_scale(u32 val)
static int pmc_core_ltr_show(struct seq_file *s, void *unused)
{
struct pmc_dev *pmcdev = s->private;
- u64 decoded_snoop_ltr, decoded_non_snoop_ltr;
- u32 ltr_raw_data, scale, val;
+ u64 decoded_snoop_ltr, decoded_non_snoop_ltr, val;
+ u32 ltr_raw_data, scale;
u16 snoop_ltr, nonsnoop_ltr;
unsigned int i, index, ltr_index = 0;