commit: cec9c56fcd21599c1c7887cc45690a0086abfd6d Author: Arisu Tachibana <alicef <AT> gentoo <DOT> org> AuthorDate: Wed Sep 10 06:17:48 2025 +0000 Commit: Arisu Tachibana <alicef <AT> gentoo <DOT> org> CommitDate: Wed Sep 10 06:17:48 2025 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=cec9c56f
Remove 2700_asus-wmi_fix_racy_registrations.patch Signed-off-by: Arisu Tachibana <alicef <AT> gentoo.org> 0000_README | 4 -- 2700_asus-wmi_fix_racy_registrations.patch | 67 ------------------------------ 2 files changed, 71 deletions(-) diff --git a/0000_README b/0000_README index 71e6b1a7..a3545e96 100644 --- a/0000_README +++ b/0000_README @@ -87,10 +87,6 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/[email protected]/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 -Patch: 2700_asus-wmi_fix_racy_registrations.patch -From: https://lore.kernel.org/all/[email protected]/#Z31drivers:platform:x86:asus-wmi.c -Desc: platform/x86: asus-wmi: Fix racy registrations - Patch: 2901_permit-menuconfig-sorting.patch From: https://lore.kernel.org/ Desc: menuconfig: Allow sorting the entries alphabetically diff --git a/2700_asus-wmi_fix_racy_registrations.patch b/2700_asus-wmi_fix_racy_registrations.patch deleted file mode 100644 index 0e012eae..00000000 --- a/2700_asus-wmi_fix_racy_registrations.patch +++ /dev/null @@ -1,67 +0,0 @@ -Subject: [PATCH] platform/x86: asus-wmi: Fix racy registrations -Date: Wed, 27 Aug 2025 07:24:33 +0200 -Message-ID: <[email protected]> -X-Mailer: git-send-email 2.50.1 -X-Mailing-List: [email protected] -List-Id: <platform-driver-x86.vger.kernel.org> -List-Subscribe: <mailto:[email protected]> -List-Unsubscribe: <mailto:[email protected]> - -asus_wmi_register_driver() may be called from multiple drivers -concurrently, which can lead to the racy list operations, eventually -corrupting the memory and hitting Oops on some ASUS machines. -Also, the error handling is missing, and it forgot to unregister ACPI -lps0 dev ops in the error case. - -This patch covers those issues by introducing a simple mutex at -acpi_wmi_register_driver() & *_unregister_driver, and adding the -proper call of asus_s2idle_check_unregister() in the error path. - -Fixes: feea7bd6b02d ("platform/x86: asus-wmi: Refactor Ally suspend/resume") -Link: https://bugzilla.suse.com/show_bug.cgi?id=1246924 -Link: https://lore.kernel.org/[email protected] -Signed-off-by: Takashi Iwai <[email protected]> ---- - drivers/platform/x86/asus-wmi.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index f7191fdded14..e72a2b5d158e 100644 ---- a/drivers/platform/x86/asus-wmi.c -+++ b/drivers/platform/x86/asus-wmi.c -@@ -5088,16 +5088,22 @@ static int asus_wmi_probe(struct platform_device *pdev) - - asus_s2idle_check_register(); - -- return asus_wmi_add(pdev); -+ ret = asus_wmi_add(pdev); -+ if (ret) -+ asus_s2idle_check_unregister(); -+ -+ return ret; - } - - static bool used; -+static DEFINE_MUTEX(register_mutex); - - int __init_or_module asus_wmi_register_driver(struct asus_wmi_driver *driver) - { - struct platform_driver *platform_driver; - struct platform_device *platform_device; - -+ guard(mutex)(®ister_mutex); - if (used) - return -EBUSY; - -@@ -5120,6 +5126,7 @@ EXPORT_SYMBOL_GPL(asus_wmi_register_driver); - - void asus_wmi_unregister_driver(struct asus_wmi_driver *driver) - { -+ guard(mutex)(®ister_mutex); - asus_s2idle_check_unregister(); - - platform_device_unregister(driver->platform_device); --- -2.50.1 - -
