From 7a7fe7feae9cdc3df8579b30f5bb8ee68e954576 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: May 26 2023 08:01:30 +0000 Subject: fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() (bsc#1154048) --- diff --git a/patches.suse/0002-fbdev-uvesafb-Fixes-an-error-handling-path-in-uvesaf.patch b/patches.suse/0002-fbdev-uvesafb-Fixes-an-error-handling-path-in-uvesaf.patch new file mode 100644 index 0000000..74b9b23 --- /dev/null +++ b/patches.suse/0002-fbdev-uvesafb-Fixes-an-error-handling-path-in-uvesaf.patch @@ -0,0 +1,38 @@ +From a94371040712031ba129c7e9d8ff04a06a2f8207 Mon Sep 17 00:00:00 2001 +From: Christophe JAILLET +Date: Sat, 10 Dec 2022 12:35:22 +0100 +Subject: fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() +Git-commit: a94371040712031ba129c7e9d8ff04a06a2f8207 +Patch-mainline: v6.2-rc1 +References: bsc#1154048 + +If an error occurs after a successful uvesafb_init_mtrr() call, it must be +undone by a corresponding arch_phys_wc_del() call, as already done in the +remove function. + +This has been added in the remove function in commit 63e28a7a5ffc +("uvesafb: Clean up MTRR code") + +Fixes: 8bdb3a2d7df4 ("uvesafb: the driver core") +Signed-off-by: Christophe JAILLET +Signed-off-by: Helge Deller +Acked-by: Thomas Zimmermann +--- + drivers/video/fbdev/uvesafb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c +index 00d789b6c0fa..0e3cabbec4b4 100644 +--- a/drivers/video/fbdev/uvesafb.c ++++ b/drivers/video/fbdev/uvesafb.c +@@ -1758,6 +1758,7 @@ static int uvesafb_probe(struct platform_device *dev) + out_unmap: + iounmap(info->screen_base); + out_mem: ++ arch_phys_wc_del(par->mtrr_handle); + release_mem_region(info->fix.smem_start, info->fix.smem_len); + out_reg: + release_region(0x3c0, 32); +-- +2.40.1 + diff --git a/series.conf b/series.conf index c58ef52..abbb93d 100644 --- a/series.conf +++ b/series.conf @@ -63229,6 +63229,7 @@ patches.suse/PCI-Check-for-alloc-failure-in-pci_request_irq.patch patches.suse/PCI-sysfs-Fix-double-free-in-error-path.patch patches.suse/crypto-arm64-Fix-unused-variable-compilation-warnings-of-cpu_feature.patch + patches.suse/0002-fbdev-uvesafb-Fixes-an-error-handling-path-in-uvesaf.patch patches.suse/tracing-Fix-infinite-loop-in-tracing_read_pipe-on-overflowed-print_trace_line.patch patches.suse/usb-typec-Check-for-ops-exit-instead-of-ops-enter-in.patch patches.suse/usb-dwc3-Fix-race-between-dwc3_set_mode-and-__dwc3_s.patch