diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 2 | ||||
| -rw-r--r-- | 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch | 2 | ||||
| -rw-r--r-- | 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 2 | ||||
| -rw-r--r-- | 0004-Partially-revert-swiotlb-remove-various-exports.patch | 29 | ||||
| -rw-r--r-- | 0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch | 63 | ||||
| -rw-r--r-- | PKGBUILD | 32 |
7 files changed, 24 insertions, 132 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-rt-bfq - pkgver = 4.16.8.3 - pkgrel = 3 + pkgver = 4.16.12.5 + pkgrel = 1 url = https://github.com/Algodev-github/bfq-mq/ arch = x86_64 license = GPL2 @@ -11,10 +11,10 @@ pkgbase = linux-rt-bfq options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.8.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.8.sign - source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.8-rt3.patch.xz - source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.8-rt3.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.12.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.12.sign + source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.12-rt5.patch.xz + source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.12-rt5.patch.sign source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/4.16-bfq-sq-mq-git-20180516.patch source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0005-objtool-add-gcc8-support.patch source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0006-include-linux-add-gcc8-support.patch @@ -29,8 +29,6 @@ pkgbase = linux-rt-bfq source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch - source = 0004-Partially-revert-swiotlb-remove-various-exports.patch - source = 0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -38,9 +36,9 @@ pkgbase = linux-rt-bfq validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 sha512sums = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 sha512sums = SKIP - sha512sums = 8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0 + sha512sums = 7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72 sha512sums = SKIP - sha512sums = 505de5fa2d98242b598c4cfef510d506c23c429bdb24c1d9d5f8beb84548e9b5f012d14236747ecb20b74136e28d19d33e880673b4adeeb4b05dc5fe31c8ff59 + sha512sums = 5b981b5758933c61526d50a47e0f454fdf6ee91d45c191dd97339972ea27f3bb27ebfa23460cf8dbbfb593e013f40ba53e3f164053ef28e4fa0aadcf4c21da03 sha512sums = SKIP sha512sums = d1dcba01d1e905dbc88346466be21845f0138c1ca635e5cc2b5d3225d6d15fe6a345ff11bf900c663c060d00746f8bcf4470121a501d612551a5168da2876ea4 sha512sums = a10a546ecced915ee38075cc6c57eaebb0f8fa58e6af6669d7429ef4880b55bd5782e11dfbda75ce4f805fa5b2399421b4eade8bbbf6766e5aac24a542f1b7a7 @@ -53,11 +51,9 @@ pkgbase = linux-rt-bfq sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44 sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf - sha512sums = e8229ab81b771f485a28162481ffee88235083195f90c9793aad4714f145609520b6c05104fc02ac40fd0a049836fe34145b5c6a452887015a6f5b0c42da6c8e - sha512sums = 2178029acb13aae77350cd77dbf78533501a3a0684be7ec6bb0df0c02a3b6d8f59d1c2a77d0171f9eab960211ea90c581a17c3cfaf336267837611d0c0be6795 - sha512sums = 3b59662258d609b24eb294ce2f7d97384ebd30590c07e257f8957ef7d56fd9bba689b7e814fe3ca9dd481d77d259bdeeeaef9ed48f10673ef7c95b30bdccefde - sha512sums = f7fdcb1fe5d882af14c72e9e59d0133c713c84394702c110b7ab8eedceecd4165b4e09c0a1860439b918f6095ff6c4e586334c9d7517229f7c7f9b9538177a81 - sha512sums = 7b8b72c8fbf99347b0b999d0e90f70a3721c8dd23589d8abd4cd6656120fb91d66b16b423f42b416a164a4ba2413dccf10587b2ed53aec14a9c040067353fb23 + sha512sums = 26619b938a47c841f0c480a113cfbb1ee6f1121c21dfecbe246c1f7af7697f86cfb8253f09966eab2e386734ce4ad156159babdba4365c2f199c369c3d7e8ee8 + sha512sums = f6aed92697c35e7919a0d784185e7af15b6be2762e3dd235267ca9744a826ac693d0ffcb07b9d1cc8571f57d518c1ce1c276cf7677e8375188f05f71d4added0 + sha512sums = cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd pkgname = linux-rt-bfq pkgdesc = Linux Kernel and modules with the RT patch and the BFQ scheduler. diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 3dc78f9e6c4c..3dd9a7d7039e 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -2,7 +2,7 @@ From ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001 Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> diff --git a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch index 4727df9b6d72..ecd2d721d1c1 100644 --- a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch +++ b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch @@ -4,7 +4,7 @@ In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffe References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> From: Mika Westerberg <mika.westerberg@linux.intel.com> Date: Mon, 23 Apr 2018 14:16:03 +0300 -Subject: [PATCH 2/5] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 +Subject: [PATCH 2/3] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 WDAT table on Lenovo Z50-70 is using RTC SRAM (ports 0x70 and 0x71) to store state of the timer. This conflicts with Linux RTC driver diff --git a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index 6e16c580ea83..78f97b2ddb3e 100644 --- a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -4,7 +4,7 @@ In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffe References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com> From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 16 May 2018 11:01:10 +0300 -Subject: [PATCH 3/5] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 3/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. diff --git a/0004-Partially-revert-swiotlb-remove-various-exports.patch b/0004-Partially-revert-swiotlb-remove-various-exports.patch deleted file mode 100644 index 775d4ca95afd..000000000000 --- a/0004-Partially-revert-swiotlb-remove-various-exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4a45daaacca4c48f4f3840a42cf1c8f385c0e82 Mon Sep 17 00:00:00 2001 -Message-Id: <a4a45daaacca4c48f4f3840a42cf1c8f385c0e82.1526520264.git.jan.steffens@gmail.com> -In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Fri, 6 Apr 2018 16:19:38 +0200 -Subject: [PATCH 4/5] Partially revert "swiotlb: remove various exports" - -This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. -The proprietary NVIDIA driver needs one of the exports. ---- - lib/swiotlb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/swiotlb.c b/lib/swiotlb.c -index dc81f16b9095..1c0a8699f8b9 100644 ---- a/lib/swiotlb.c -+++ b/lib/swiotlb.c -@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, - } - return nelems; - } -+EXPORT_SYMBOL(swiotlb_map_sg_attrs); - - /* - * Unmap a set of streaming mode DMA translations. Again, cpu read rules --- -2.17.0 - diff --git a/0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch b/0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch deleted file mode 100644 index 1347693a8b0f..000000000000 --- a/0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 005c2f4576d9bab5ff97dac4b3d27aafa2f1f153 Mon Sep 17 00:00:00 2001 -Message-Id: <005c2f4576d9bab5ff97dac4b3d27aafa2f1f153.1526520264.git.jan.steffens@gmail.com> -In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -From: Mathias Nyman <mathias.nyman@linux.intel.com> -Date: Mon, 14 May 2018 11:57:23 +0300 -Subject: [PATCH 5/5] xhci: Fix USB3 NULL pointer dereference at logical - disconnect. - -Hub driver will try to disable a USB3 device twice at logical disconnect, -racing with xhci_free_dev() callback from the first port disable. - -This can be triggered with "udisksctl power-off --block-device <disk>" -or by writing "1" to the "remove" sysfs file for a USB3 device -in 4.17-rc4. - -USB3 devices don't have a similar disabled link state as USB2 devices, -and use a U3 suspended link state instead. In this state the port -is still enabled and connected. - -hub_port_connect() first disconnects the device, then later it notices -that device is still enabled (due to U3 states) it will try to disable -the port again (set to U3). - -The xhci_free_dev() called during device disable is async, so checking -for existing xhci->devs[i] when setting link state to U3 the second time -was successful, even if device was being freed. - -The regression was caused by, and whole thing revealed by, -Commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") -which sets xhci->devs[i]->udev to NULL before xhci_virt_dev() returned. -and causes a NULL pointer dereference the second time we try to set U3. - -Fix this by checking xhci->devs[i]->udev exists before setting link state. - -The original patch went to stable so this fix needs to be applied there as -well. - -Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") -Cc: <stable@vger.kernel.org> -Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch> -Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch> -Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> ---- - drivers/usb/host/xhci-hub.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c -index 72ebbc908e19..32cd52ca8318 100644 ---- a/drivers/usb/host/xhci-hub.c -+++ b/drivers/usb/host/xhci-hub.c -@@ -354,7 +354,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, - - slot_id = 0; - for (i = 0; i < MAX_HC_SLOTS; i++) { -- if (!xhci->devs[i]) -+ if (!xhci->devs[i] || !xhci->devs[i]->udev) - continue; - speed = xhci->devs[i]->udev->speed; - if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3)) --- -2.17.0 - @@ -59,12 +59,12 @@ pkgbase=linux-rt-bfq # pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs') _major=4.16 _srcname=linux-${_major} -_minor=8 -_rtver=3 +_minor=12 +_rtver=5 pkgver=${_major}.${_minor}.${_rtver} _pkgver=${_major}.${_minor} _rtpatchver=rt${_rtver} -pkgrel=3 +pkgrel=1 arch=('x86_64') url="https://github.com/Algodev-github/bfq-mq/" license=('GPL2') @@ -103,9 +103,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'linux.preset' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' '0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch' - '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch' - '0004-Partially-revert-swiotlb-remove-various-exports.patch' - '0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch') + '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch') _kernelname=${pkgbase#linux} : ${_kernelname:=-rt-bfq} @@ -131,15 +129,7 @@ prepare() { ### Fix https://bugs.archlinux.org/task/56711 msg "Fix #56711" - patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch - - ### NVIDIA driver compat - msg "NVIDIA driver compat" - patch -Np1 -i ../0004-Partially-revert-swiotlb-remove-various-exports.patch - - ### Fix https://bugs.archlinux.org/task/58237 - msg "Fix #58237" - patch -Np1 -i ../0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch + patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch ### Fix gcc8 bogus warnings msg "Fix gcc8 bogus warnings" @@ -431,9 +421,9 @@ done sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662' 'SKIP' - '8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0' + '7bd2b4fa54b69df5558a4a151936fb1787f2faa0f4e73c03db04ef84ac088f764425faf5d6b5a023d4863e190775dcbb251eba1efc3b10eb133330bb6b210b72' 'SKIP' - '505de5fa2d98242b598c4cfef510d506c23c429bdb24c1d9d5f8beb84548e9b5f012d14236747ecb20b74136e28d19d33e880673b4adeeb4b05dc5fe31c8ff59' + '5b981b5758933c61526d50a47e0f454fdf6ee91d45c191dd97339972ea27f3bb27ebfa23460cf8dbbfb593e013f40ba53e3f164053ef28e4fa0aadcf4c21da03' 'SKIP' 'd1dcba01d1e905dbc88346466be21845f0138c1ca635e5cc2b5d3225d6d15fe6a345ff11bf900c663c060d00746f8bcf4470121a501d612551a5168da2876ea4' 'a10a546ecced915ee38075cc6c57eaebb0f8fa58e6af6669d7429ef4880b55bd5782e11dfbda75ce4f805fa5b2399421b4eade8bbbf6766e5aac24a542f1b7a7' @@ -446,11 +436,9 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2 '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - 'e8229ab81b771f485a28162481ffee88235083195f90c9793aad4714f145609520b6c05104fc02ac40fd0a049836fe34145b5c6a452887015a6f5b0c42da6c8e' - '2178029acb13aae77350cd77dbf78533501a3a0684be7ec6bb0df0c02a3b6d8f59d1c2a77d0171f9eab960211ea90c581a17c3cfaf336267837611d0c0be6795' - '3b59662258d609b24eb294ce2f7d97384ebd30590c07e257f8957ef7d56fd9bba689b7e814fe3ca9dd481d77d259bdeeeaef9ed48f10673ef7c95b30bdccefde' - 'f7fdcb1fe5d882af14c72e9e59d0133c713c84394702c110b7ab8eedceecd4165b4e09c0a1860439b918f6095ff6c4e586334c9d7517229f7c7f9b9538177a81' - '7b8b72c8fbf99347b0b999d0e90f70a3721c8dd23589d8abd4cd6656120fb91d66b16b423f42b416a164a4ba2413dccf10587b2ed53aec14a9c040067353fb23') + '26619b938a47c841f0c480a113cfbb1ee6f1121c21dfecbe246c1f7af7697f86cfb8253f09966eab2e386734ce4ad156159babdba4365c2f199c369c3d7e8ee8' + 'f6aed92697c35e7919a0d784185e7af15b6be2762e3dd235267ca9744a826ac693d0ffcb07b9d1cc8571f57d518c1ce1c276cf7677e8375188f05f71d4added0' + 'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds |