From: Sasha Levin Date: Sun, 29 Aug 2021 23:38:00 +0000 (-0400) Subject: Fixes for 5.10 X-Git-Tag: v4.4.283~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f34c2ddbcaa7dfe75243099ff1ccff124e668d98;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/clk-renesas-rcar-usb2-clock-sel-fix-kernel-null-poin.patch b/queue-5.10/clk-renesas-rcar-usb2-clock-sel-fix-kernel-null-poin.patch new file mode 100644 index 00000000000..e9c6b76b7ab --- /dev/null +++ b/queue-5.10/clk-renesas-rcar-usb2-clock-sel-fix-kernel-null-poin.patch @@ -0,0 +1,39 @@ +From e9b19dd2e911faf593581ae31cef693a227e698b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Aug 2021 09:17:21 -0500 +Subject: clk: renesas: rcar-usb2-clock-sel: Fix kernel NULL pointer + dereference + +From: Adam Ford + +[ Upstream commit 1669a941f7c4844ae808cf441db51dde9e94db07 ] + +The probe was manually passing NULL instead of dev to devm_clk_hw_register. +This caused a Unable to handle kernel NULL pointer dereference error. +Fix this by passing 'dev'. + +Signed-off-by: Adam Ford +Fixes: a20a40a8bbc2 ("clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe()") +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c +index 0ccc6e709a38..7a64dcb7209e 100644 +--- a/drivers/clk/renesas/rcar-usb2-clock-sel.c ++++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c +@@ -190,7 +190,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) + init.num_parents = 0; + priv->hw.init = &init; + +- ret = devm_clk_hw_register(NULL, &priv->hw); ++ ret = devm_clk_hw_register(dev, &priv->hw); + if (ret) + goto pm_put; + +-- +2.30.2 + diff --git a/queue-5.10/perf-x86-intel-uncore-fix-integer-overflow-on-23-bit.patch b/queue-5.10/perf-x86-intel-uncore-fix-integer-overflow-on-23-bit.patch new file mode 100644 index 00000000000..455ea591e02 --- /dev/null +++ b/queue-5.10/perf-x86-intel-uncore-fix-integer-overflow-on-23-bit.patch @@ -0,0 +1,49 @@ +From b1376ab09ae349176fa0bd59cf6315de3c50372f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 6 Jul 2021 12:45:53 +0100 +Subject: perf/x86/intel/uncore: Fix integer overflow on 23 bit left shift of a + u32 + +From: Colin Ian King + +[ Upstream commit 0b3a8738b76fe2087f7bc2bd59f4c78504c79180 ] + +The u32 variable pci_dword is being masked with 0x1fffffff and then left +shifted 23 places. The shift is a u32 operation,so a value of 0x200 or +more in pci_dword will overflow the u32 and only the bottow 32 bits +are assigned to addr. I don't believe this was the original intent. +Fix this by casting pci_dword to a resource_size_t to ensure no +overflow occurs. + +Note that the mask and 12 bit left shift operation does not need this +because the mask SNR_IMC_MMIO_MEM0_MASK and shift is always a 32 bit +value. + +Fixes: ee49532b38dd ("perf/x86/intel/uncore: Add IMC uncore support for Snow Ridge") +Addresses-Coverity: ("Unintentional integer overflow") +Signed-off-by: Colin Ian King +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Ingo Molnar +Reviewed-by: Kan Liang +Link: https://lore.kernel.org/r/20210706114553.28249-1-colin.king@canonical.com +Signed-off-by: Sasha Levin +--- + arch/x86/events/intel/uncore_snbep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c +index 9c936d06fb61..2701f87a9a7c 100644 +--- a/arch/x86/events/intel/uncore_snbep.c ++++ b/arch/x86/events/intel/uncore_snbep.c +@@ -4669,7 +4669,7 @@ static void __snr_uncore_mmio_init_box(struct intel_uncore_box *box, + return; + + pci_read_config_dword(pdev, SNR_IMC_MMIO_BASE_OFFSET, &pci_dword); +- addr = (pci_dword & SNR_IMC_MMIO_BASE_MASK) << 23; ++ addr = ((resource_size_t)pci_dword & SNR_IMC_MMIO_BASE_MASK) << 23; + + pci_read_config_dword(pdev, mem_offset, &pci_dword); + addr |= (pci_dword & SNR_IMC_MMIO_MEM0_MASK) << 12; +-- +2.30.2 + diff --git a/queue-5.10/series b/queue-5.10/series index 12741b96304..9af6b5cce99 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -49,3 +49,5 @@ net-stmmac-fix-kernel-panic-due-to-null-pointer-dere.patch drm-i915-fix-syncmap-memory-leak.patch usb-gadget-u_audio-fix-race-condition-on-endpoint-st.patch dt-bindings-sifive-l2-cache-fix-select-matching.patch +perf-x86-intel-uncore-fix-integer-overflow-on-23-bit.patch +clk-renesas-rcar-usb2-clock-sel-fix-kernel-null-poin.patch