[arch-commits] Commit in linux-hardened/trunk (3 files)

Levente Polyak anthraxx at archlinux.org
Fri Feb 23 23:44:54 UTC 2018


    Date: Friday, February 23, 2018 @ 23:44:53
  Author: anthraxx
Revision: 297282

upgpkg: linux-hardened 4.15.5.a-1

Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
Deleted:
  linux-hardened/trunk/x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch

------------------------------------------------------------+
 PKGBUILD                                                   |   12 --
 config.x86_64                                              |   25 +---
 x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch |   59 -----------
 3 files changed, 13 insertions(+), 83 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-23 23:30:45 UTC (rev 297281)
+++ PKGBUILD	2018-02-23 23:44:53 UTC (rev 297282)
@@ -5,7 +5,7 @@
 
 pkgbase=linux-hardened
 _srcname=linux-4.15
-_pkgver=4.15.4
+_pkgver=4.15.5
 pkgver=${_pkgver}.a
 pkgrel=1
 url='https://github.com/copperhead/linux-hardened'
@@ -25,21 +25,19 @@
 
         # https://bugs.archlinux.org/task/56711
         drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
-        x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch
 )
 replaces=('linux-grsec')
 sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
             'SKIP'
-            '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8'
+            'b5dc7021bd0c08e4a58b59035f9b757ce6909b46067950ac56d2ad68c1b69dd1'
             'SKIP'
-            '176355facdd3a0e8b8bfbb92d1a6a321b854391da96f5c142054f37fd6548bb9'
+            '6c5056cbdba83f3d4bd3103936d4b059665e57303f7eb04c961df855c3f9f25a'
             'SKIP'
-            'd27d4c2d5d9731addcc322d3e33e8d0b5d6a47cb137c8da121c533ed952a6056'
+            '6a483e956d1ccd990c5268b619161cb3a5debf8688a7a1552cc375b92f6fc9d8'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148'
-            'fec79162a6220b7bf4d663c156303af61405d66427dd49351aa9fb9373c882e5')
+            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman

Modified: config.x86_64
===================================================================
--- config.x86_64	2018-02-23 23:30:45 UTC (rev 297281)
+++ config.x86_64	2018-02-23 23:44:53 UTC (rev 297282)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.4 Kernel Configuration
+# Linux/x86 4.15.5 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -5876,7 +5876,7 @@
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
-CONFIG_FB_DDC=m
+# CONFIG_FB_DDC is not set
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -5904,8 +5904,8 @@
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
@@ -5912,22 +5912,13 @@
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
+# CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_S3 is not set
@@ -6001,7 +5992,7 @@
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 CONFIG_BACKLIGHT_ARCXCNN=m
-CONFIG_VGASTATE=m
+# CONFIG_VGASTATE is not set
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 

Deleted: x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch
===================================================================
--- x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch	2018-02-23 23:30:45 UTC (rev 297281)
+++ x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch	2018-02-23 23:44:53 UTC (rev 297282)
@@ -1,59 +0,0 @@
-From 4f277295e54c5b7340e48efea3fc5cc21a2872b7 Mon Sep 17 00:00:00 2001
-From: Juergen Gross <jgross at suse.com>
-Date: Thu, 1 Feb 2018 13:40:19 +0100
-Subject: [PATCH] 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 at vger.kernel.org
-Signed-off-by: Juergen Gross <jgross at suse.com>
-Reviewed-by: Boris Ostrovsky <boris.ostrovsky at oracle.com>
-Tested-by: Chris Patterson <cjp256 at gmail.com>
-Signed-off-by: Juergen Gross <jgross at suse.com>
----
- 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,7 +9,9 @@
- 
- #include <asm/boot.h>
- #include <asm/asm.h>
-+#include <asm/msr.h>
- #include <asm/page_types.h>
-+#include <asm/percpu.h>
- #include <asm/unwind_hints.h>
- 
- #include <xen/interface/elfnote.h>
-@@ -35,6 +37,20 @@ ENTRY(startup_xen)
- 	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
-



More information about the arch-commits mailing list