Update to 5.9.12-2

7 files changed, 43 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cf5bf76d05d..0e0646ff45ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ck
 	pkgver = 5.9.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
@@ -17,6 +17,7 @@ pkgbase = linux-ck
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
 	source = 0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+	source = 0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	b2sums = 9e7a86c22993f4bf1a2eda9edd8aacf768ddfb67d109eba78f0719a27d0243767b197a205142524b158c176fe5e1a08de091f4c8f35612267737f2a5ba2dbdc9
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 31ef86fc54b5..8f92b6c86bc4 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,4 +1,4 @@
-From 730629bfe4efc95aaee0de463ea410e31153cef9 Mon Sep 17 00:00:00 2001
+From c3517e2c26868cad0fda418a8815b2e0b818bf92 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
 Subject: [PATCH 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
index 61ae53b4b1e9..963305f370a6 100644
--- a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
+++ b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
@@ -1,4 +1,4 @@
-From 08f9b12aec2533a309a5f6d7ff47d01ee3179a35 Mon Sep 17 00:00:00 2001
+From 48085266a9b724af6f35ad4eabd31ac8b8bfa064 Mon Sep 17 00:00:00 2001
 From: Sathish Narasimman <nsathish41@gmail.com>
 Date: Thu, 29 Oct 2020 13:18:21 +0530
 Subject: [PATCH 2/5] Bluetooth: Fix: LL PRivacy BLE device fails to connect
diff --git a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch b/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
index 1c796dbceb63..f108122ccb83 100644
--- a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+++ b/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
@@ -1,4 +1,4 @@
-From 4264c74c96e7907b60ee6ed82670317d19ed7ebe Mon Sep 17 00:00:00 2001
+From 3d936926666bb681f2a9ed6e04f685667e61e2b4 Mon Sep 17 00:00:00 2001
 From: Edward Vear <edwardvear@gmail.com>
 Date: Tue, 27 Oct 2020 00:02:03 -0700
 Subject: [PATCH 3/5] Bluetooth: Fix attempting to set RPA timeout when
diff --git a/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
new file mode 100644
index 000000000000..8dad0a08d8ac
--- /dev/null
+++ b/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
@@ -0,0 +1,36 @@
+From b8c149d9a7cf8ec50440d0dcd90ff754ba72b616 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
+Date: Thu, 19 Nov 2020 09:22:32 +0100
+Subject: [PATCH 4/5] HID: quirks: Add Apple Magic Trackpad 2 to
+ hid_have_special_driver list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Apple Magic Trackpad 2 is handled by the magicmouse driver. And
+there were severe stability issues when both drivers (hid-generic and
+hid-magicmouse) were loaded for this device.
+
+Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=210241
+
+Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
+---
+ drivers/hid/hid-quirks.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
+index bf7ecab5d9e5..142e9dae2837 100644
+--- a/drivers/hid/hid-quirks.c
++++ b/drivers/hid/hid-quirks.c
+@@ -478,6 +478,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ #if IS_ENABLED(CONFIG_HID_MAGICMOUSE)
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
++	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
+ #endif
+ #if IS_ENABLED(CONFIG_HID_MAYFLASH)
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
+-- 
+2.29.2
+
diff --git a/0004-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch b/0004-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch
deleted file mode 100644
index 779cbb00a60c..000000000000
--- a/0004-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a163474e9b86c2c25f20733385d8b1d6de492a7f Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Wed, 25 Nov 2020 08:45:55 +0100
-Subject: [PATCH 4/5] efivarfs: revert "fix memory leak in efivarfs_create()"
-
-The memory leak addressed by commit fe5186cf12e3 is a false positive:
-all allocations are recorded in a linked list, and freed when the
-filesystem is unmounted. This leads to double frees, and as reported
-by David, leads to crashes if SLUB is configured to self destruct when
-double frees occur.
-
-So drop the redundant kfree() again, and instead, mark the offending
-pointer variable so the allocation is ignored by kmemleak.
-
-Cc: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
-Fixes: fe5186cf12e3 ("efivarfs: fix memory leak in efivarfs_create()")
-Reported-by: David Laight <David.Laight@aculab.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
----
- fs/efivarfs/inode.c | 2 ++
- fs/efivarfs/super.c | 1 -
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c
-index 96c0c86f3fff..0297ad95eb5c 100644
---- a/fs/efivarfs/inode.c
-+++ b/fs/efivarfs/inode.c
-@@ -7,6 +7,7 @@
- #include <linux/efi.h>
- #include <linux/fs.h>
- #include <linux/ctype.h>
-+#include <linux/kmemleak.h>
- #include <linux/slab.h>
- #include <linux/uuid.h>
- 
-@@ -103,6 +104,7 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry,
- 	var->var.VariableName[i] = '\0';
- 
- 	inode->i_private = var;
-+	kmemleak_ignore(var);
- 
- 	err = efivar_entry_add(var, &efivarfs_list);
- 	if (err)
-diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
-index f943fd0b0699..15880a68faad 100644
---- a/fs/efivarfs/super.c
-+++ b/fs/efivarfs/super.c
-@@ -21,7 +21,6 @@ LIST_HEAD(efivarfs_list);
- static void efivarfs_evict_inode(struct inode *inode)
- {
- 	clear_inode(inode);
--	kfree(inode->i_private);
- }
- 
- static const struct super_operations efivarfs_ops = {
--- 
-2.29.2
-
diff --git a/PKGBUILD b/PKGBUILD
index a1354f63c29c..f46a96a0037e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,7 +65,7 @@ _localmodcfg=
 
 pkgbase=linux-ck
 pkgver=5.9.12
-pkgrel=1
+pkgrel=2
 _ckpatchversion=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -85,6 +85,7 @@ source=(
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
   0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+  0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds