From 1811c518471444965fd0d1d3670a7bce88bf22e0 Mon Sep 17 00:00:00 2001 From: Jan Alexander Steffens Date: Tue, 22 May 2018 22:29:49 +0000 Subject: [PATCH] 4.16.11-1 --- ...sallow-unprivileged-CLONE_NEWUSER-by.patch | 6 +- ...y-use-the-alternate-fixed-mode-if-it.patch | 10 +-- ...evert-swiotlb-remove-various-exports.patch | 29 --------- ...LL-pointer-dereference-at-logical-di.patch | 63 ------------------- PKGBUILD | 18 ++---- 5 files changed, 12 insertions(+), 114 deletions(-) delete mode 100644 0003-Partially-revert-swiotlb-remove-various-exports.patch delete mode 100644 0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch 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 9f83479..f669b43 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From 1d8e17daf031e219d904ef93718081534c9e8cea Mon Sep 17 00:00:00 2001 -Message-Id: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> +From 05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8 Mon Sep 17 00:00:00 2001 +Message-Id: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com> From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/4] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch index e33c05a..0fb23b7 100644 --- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -1,10 +1,10 @@ -From 97ed8f58f1e019eca30233ffc6a14e6eddac1a36 Mon Sep 17 00:00:00 2001 -Message-Id: <97ed8f58f1e019eca30233ffc6a14e6eddac1a36.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 b5f4a5ba26b365471531e328b237887bab4ab89b Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com> +References: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com> From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/4] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's asked for In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch deleted file mode 100644 index de1bdde..0000000 --- a/0003-Partially-revert-swiotlb-remove-various-exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4a45daaacca4c48f4f3840a42cf1c8f385c0e82 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" -Date: Fri, 6 Apr 2018 16:19:38 +0200 -Subject: [PATCH 3/4] 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/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch b/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch deleted file mode 100644 index 009251c..0000000 --- a/0004-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 -Date: Mon, 14 May 2018 11:57:23 +0300 -Subject: [PATCH 4/4] 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 " -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: -Reported-by: Jordan Glover -Tested-by: Jordan Glover -Signed-off-by: Mathias Nyman ---- - 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 - diff --git a/PKGBUILD b/PKGBUILD index ecdcb74..2dffded 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.16 -pkgver=4.16.10 +pkgver=4.16.11 pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" @@ -20,8 +20,6 @@ source=( linux.preset # standard config files for mkinitcpio ramdisk 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - 0003-Partially-revert-swiotlb-remove-various-exports.patch - 0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -29,16 +27,14 @@ validpgpkeys=( ) sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9' 'SKIP' - '9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6' + 'd0d998f193c3feeab95f1378dea15aa6ba145f591661547cc00ef16d161651fe' 'SKIP' 'e39c02fd021f125a6202f7e4c0692dfd3ced93d404ecb6c8dca6994c8e17b227' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '69241df4bd7897eb04db90e4d0a82c6e0b99b806019ba96bb885278ca8da89df' - '10728f672a83a515af540cafafde62346e9ccc2d14bf74e417fd2693865b1293' - 'a81b612369e78d142ff80ec3adda36b3f94503e5a68d54282c508a112cc8dae0' - '052a39582f84c52b027c261fcec90325493f4d46f15647c274a58e39145deced') + 'b01e9bd4e0f3cc2b91db1d8c043b2d85329bd0c9a9441a91d337c3c33661b658' + '09170daf49fe4cb720f331cd2da1c75771eb4f9f124353bf035218b1f8ca57d1') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -58,12 +54,6 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - # NVIDIA driver compat - patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch - - # https://bugs.archlinux.org/task/58237 - patch -Np1 -i ../0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch - cat ../config - >.config <