From e180e6ba0206ea08ba0c53ef9f261de1a625e6ed Mon Sep 17 00:00:00 2001 From: Jan Alexander Steffens Date: Thu, 22 Feb 2018 23:04:15 +0000 Subject: [PATCH] 4.15.5-1 --- ...sallow-unprivileged-CLONE_NEWUSER-by.patch | 8 +- ...y-use-the-alternate-fixed-mode-if-it.patch | 12 +-- ...very-early-to-avoid-page-faults-with.patch | 80 ------------------- PKGBUILD | 15 ++-- config | 2 +- 5 files changed, 16 insertions(+), 101 deletions(-) delete mode 100644 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.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 f155e96..1385f92 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 05a43fb8b36cdaf6a3580f46cab334f2c2796544 Mon Sep 17 00:00:00 2001 -Message-Id: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +From 16305718ac69980301a803f32373cd0d80473a1c Mon Sep 17 00:00:00 2001 +Message-Id: <16305718ac69980301a803f32373cd0d80473a1c.1519311274.git.jan.steffens@gmail.com> From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/3] 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 @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.16.1 +2.16.2 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 97848fc..7338383 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 9ae12d036a480aa5352118c982ba76f2fb1640a3 Mon Sep 17 00:00:00 2001 -Message-Id: <9ae12d036a480aa5352118c982ba76f2fb1640a3.1518828081.git.jan.steffens@gmail.com> -In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +From caccd577f10e4618e87c8b21bb14ab867208df04 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <16305718ac69980301a803f32373cd0d80473a1c.1519311274.git.jan.steffens@gmail.com> +References: <16305718ac69980301a803f32373cd0d80473a1c.1519311274.git.jan.steffens@gmail.com> From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/3] 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 @@ -38,5 +38,5 @@ index add4b2434aa3..14a8bef9fdfe 100644 } -- -2.16.1 +2.16.2 diff --git a/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch b/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch deleted file mode 100644 index 4b49073..0000000 --- a/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch +++ /dev/null @@ -1,80 +0,0 @@ -From cd0c80aa02dbfe649c743fa98fcc0d9f427e0827 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -From: Juergen Gross -Date: Thu, 1 Feb 2018 13:40:19 +0100 -Subject: [PATCH 3/3] x86/xen: init %gs very early to avoid page faults with - stack protector - -When running as Xen pv guest %gs is initialized some time after -C code is started. Depending on stack protector usage this might be -too late, resulting in page faults. - -So setup %gs and MSR_GS_BASE in assembly code already. - -Cc: stable@vger.kernel.org -Signed-off-by: Juergen Gross -Reviewed-by: Boris Ostrovsky -Tested-by: Chris Patterson -Signed-off-by: Juergen Gross ---- - arch/x86/xen/xen-head.S | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S -index 497cc55a0c16..96f26e026783 100644 ---- a/arch/x86/xen/xen-head.S -+++ b/arch/x86/xen/xen-head.S -@@ -9,32 +9,48 @@ - - #include - #include -+#include - #include -+#include - #include - - #include - #include - #include - #include - #include - - #ifdef CONFIG_XEN_PV - __INIT - ENTRY(startup_xen) - UNWIND_HINT_EMPTY - cld - - /* Clear .bss */ - xor %eax,%eax - mov $__bss_start, %_ASM_DI - mov $__bss_stop, %_ASM_CX - sub %_ASM_DI, %_ASM_CX - shr $__ASM_SEL(2, 3), %_ASM_CX - rep __ASM_SIZE(stos) - - mov %_ASM_SI, xen_start_info - mov $init_thread_union+THREAD_SIZE, %_ASM_SP - -+#ifdef CONFIG_X86_64 -+ /* Set up %gs. -+ * -+ * The base of %gs always points to the bottom of the irqstack -+ * union. If the stack protector canary is enabled, it is -+ * located at %gs:40. Note that, on SMP, the boot cpu uses -+ * init data section till per cpu areas are set up. -+ */ -+ movl $MSR_GS_BASE,%ecx -+ movq $INIT_PER_CPU_VAR(irq_stack_union),%rax -+ cdq -+ wrmsr -+#endif -+ - jmp xen_start_kernel - END(startup_xen) - __FINIT --- -2.16.1 - diff --git a/PKGBUILD b/PKGBUILD index 565638e..80f742f 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.15 -pkgver=4.15.4 +pkgver=4.15.5 pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" @@ -20,7 +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-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -28,15 +27,14 @@ validpgpkeys=( ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8' + 'b5dc7021bd0c08e4a58b59035f9b757ce6909b46067950ac56d2ad68c1b69dd1' 'SKIP' - '0919ad90c07fb651f9e8b30e4911a9c300940301d7323070186851b4280c571b' + 'f38927db126ec7141ea2dd70cabb2ef378552672b31db4ab621493928497abd7' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863' - 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676' - '54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7') + '19b17156ea5aec86e4eb87fc855789375a5184faf564b4ac2cd0f279de7b3bf9' + 'f49e23e2a00357f8a5f6cc5caadd56a4df2b0a3e2b53d76a514ca508f25a62a7') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -56,9 +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 - # https://bugs.archlinux.org/task/57500 - patch -Np1 -i ../0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch - cat ../config - >.config <