diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 6 | ||||
| -rw-r--r-- | 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch | 10 | ||||
| -rw-r--r-- | 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch | 56 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
5 files changed, 79 insertions, 17 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.16.2 + pkgver = 5.16.3 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -12,22 +12,24 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.2.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.2.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.3.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.3.tar.sign source = config source = more-uarches-20211114.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20211114.tar.gz source = xanmod-patches-from-ck-6b08df20f31708099a7fbccf5448958b4836118f.tar.gz::https://github.com/xanmod/linux-patches/archive/6b08df20f31708099a7fbccf5448958b4836118f.tar.gz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch + source = 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = 6f07d9da86101ab72eadd53a9f58a4740037608a006fc622a923d4dd9578ce62cc9959711dca2e953e3fb68286f55fb14be04a4a00fc49a33c2c28bd5944532f + b2sums = 69e27d11073f60f7ed28e500f52b8b86c98fd080827947bac91f59013b10a37350b22403bfbd9a705c6d0a14c4ddef0547ab61b64bcefbde46f707a5e2a10b40 b2sums = SKIP b2sums = 3c6ff0fd8713cf5f0f0f939e45826bc83a7c4458665ae59094d83c416ae536fd8ed3370dec813d1b442ce727459150a0ef04a001cadb2c5ef7d3e2b01d5849da b2sums = 534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d b2sums = 7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a - b2sums = 8c06f840512d90c2339066677f1c64c07d1d9b7cd9a7d653fa7be1f806b0c66cb26892db662ef95cb6c27c996aef03566454699cfaa8d620dcb90c1f8f8d8276 - b2sums = 863763c1880921c15f4d931194004461c1cb2bf195bb55ae04777694c15c01542e30d8f221d908b4fbb6a57e7b36e3260a97d67a109af3baeb53d6a85b671dd9 + b2sums = 163ca2dc04f259cc99a58bc9ef25a54757b82ddc68ac40fdf21fa9f877d901aacf5081f6a44d2b2041ad731afaeac863549834f652a9622eaa84db44965525ec + b2sums = 0d264914102c22a3addd23ae94dbf8eba666c833ffd2c78d1a4f2633407365c4e5c5a84c95576f37ddf37759820b05d26ee80de2120f71e04b75559793a90385 + b2sums = b18b3d5d005bc9cb1479899534f35dc3797e0094fd1304ef57ef5e6e786ec7fbe7364a4421769ab4a4098a6150db0b93ae36043504c4f78251fef8ca2cc4791e pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with ck's hrtimer patches 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 b8860dda35f6..8ee98765b827 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,7 +1,7 @@ -From 0d81807c2280706a94cf5acc0806d1f33212b91e Mon Sep 17 00:00:00 2001 +From 0532d2afac2ebe0cb5de82ce53492e18141a2e72 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/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -150,5 +150,5 @@ index 6b2e3ca7ee99..0253002184f1 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.34.1 +2.35.0 diff --git a/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch index 78b4f61f9208..8493375f2e05 100644 --- a/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch +++ b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch @@ -1,7 +1,7 @@ -From abf563c100e1bde5fcf6262ee80f7a89c77d86cd Mon Sep 17 00:00:00 2001 +From 70cb00864cd424dd777fb97e637e31c7d949d81c Mon Sep 17 00:00:00 2001 From: Kiran K <kiran.k@intel.com> Date: Wed, 13 Oct 2021 13:35:11 +0530 -Subject: [PATCH 2/3] Bluetooth: btintel: Fix bdaddress comparison with garbage +Subject: [PATCH 2/4] Bluetooth: btintel: Fix bdaddress comparison with garbage value Intel Read Verision(TLV) data is parsed into a local structure variable @@ -11,12 +11,14 @@ only if controller is present in boot loader mode. Signed-off-by: Kiran K <kiran.k@intel.com> Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com> +Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +(cherry picked from commit 893505319c74cf3faa45a5ed9d5338ff03b66949) --- drivers/bluetooth/btintel.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c -index b11567b0fd9a..ef679b388bac 100644 +index 851a0c9b8fae..1a4f8b227eac 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2081,14 +2081,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, @@ -56,5 +58,5 @@ index b11567b0fd9a..ef679b388bac 100644 err = btintel_parse_version_tlv(hdev, &ver_tlv, skb); if (err) { -- -2.34.1 +2.35.0 diff --git a/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch new file mode 100644 index 000000000000..9b8e948cb97e --- /dev/null +++ b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch @@ -0,0 +1,56 @@ +From db071152c6a3ebcc82426cbd2ce97d74ba3f6513 Mon Sep 17 00:00:00 2001 +From: Kiran K <kiran.k@intel.com> +Date: Tue, 5 Oct 2021 20:15:56 +0530 +Subject: [PATCH 3/4] Bluetooth: Read codec capabilities only if supported + +Read codec capabilities only if HCI_READ_LOCAL_CODEC_CAPABILITIES +command is supported. If capablities are not supported, then +cache codec data without caps. + +Signed-off-by: Kiran K <kiran.k@intel.com> +Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +For: https://bugs.archlinux.org/task/73454 +--- + net/bluetooth/hci_codec.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c +index f0421d0edaa3..38201532f58e 100644 +--- a/net/bluetooth/hci_codec.c ++++ b/net/bluetooth/hci_codec.c +@@ -25,9 +25,11 @@ static int hci_codec_list_add(struct list_head *list, + } + entry->transport = sent->transport; + entry->len = len; +- entry->num_caps = rp->num_caps; +- if (rp->num_caps) ++ entry->num_caps = 0; ++ if (rp) { ++ entry->num_caps = rp->num_caps; + memcpy(entry->caps, caps, len); ++ } + list_add(&entry->list, list); + + return 0; +@@ -58,6 +60,18 @@ static void hci_read_codec_capabilities(struct hci_dev *hdev, __u8 transport, + __u32 len; + + cmd->transport = i; ++ ++ /* If Read_Codec_Capabilities command is not supported ++ * then just add codec to the list without caps ++ */ ++ if (!(hdev->commands[45] & 0x08)) { ++ hci_dev_lock(hdev); ++ hci_codec_list_add(&hdev->local_codecs, cmd, ++ NULL, NULL, 0); ++ hci_dev_unlock(hdev); ++ continue; ++ } ++ + skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_CODEC_CAPS, + sizeof(*cmd), cmd, + HCI_CMD_TIMEOUT); +-- +2.35.0 + @@ -64,7 +64,7 @@ _subarch= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.16.2 +pkgver=5.16.3 pkgrel=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -87,18 +87,20 @@ source=( "xanmod-patches-from-ck-$_commit.tar.gz::https://github.com/xanmod/linux-patches/archive/$_commit.tar.gz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch + 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('6f07d9da86101ab72eadd53a9f58a4740037608a006fc622a923d4dd9578ce62cc9959711dca2e953e3fb68286f55fb14be04a4a00fc49a33c2c28bd5944532f' +b2sums=('69e27d11073f60f7ed28e500f52b8b86c98fd080827947bac91f59013b10a37350b22403bfbd9a705c6d0a14c4ddef0547ab61b64bcefbde46f707a5e2a10b40' 'SKIP' '3c6ff0fd8713cf5f0f0f939e45826bc83a7c4458665ae59094d83c416ae536fd8ed3370dec813d1b442ce727459150a0ef04a001cadb2c5ef7d3e2b01d5849da' '534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d' '7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a' - '8c06f840512d90c2339066677f1c64c07d1d9b7cd9a7d653fa7be1f806b0c66cb26892db662ef95cb6c27c996aef03566454699cfaa8d620dcb90c1f8f8d8276' - '863763c1880921c15f4d931194004461c1cb2bf195bb55ae04777694c15c01542e30d8f221d908b4fbb6a57e7b36e3260a97d67a109af3baeb53d6a85b671dd9') + '163ca2dc04f259cc99a58bc9ef25a54757b82ddc68ac40fdf21fa9f877d901aacf5081f6a44d2b2041ad731afaeac863549834f652a9622eaa84db44965525ec' + '0d264914102c22a3addd23ae94dbf8eba666c833ffd2c78d1a4f2633407365c4e5c5a84c95576f37ddf37759820b05d26ee80de2120f71e04b75559793a90385' + 'b18b3d5d005bc9cb1479899534f35dc3797e0094fd1304ef57ef5e6e786ec7fbe7364a4421769ab4a4098a6150db0b93ae36043504c4f78251fef8ca2cc4791e') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |