mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-16 14:52:24 +01:00
Merge pull request #3358 from dm0-/linux
Bump Linux 4.14.60 to 4.14.61 and 4.17.12 to 4.17.13
This commit is contained in:
David Michael
GitHub
commit
9542f55209
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.60 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.60
|
||||
DEPEND==sys-kernel/coreos-modules-4.14.61 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.14.61
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.60
|
||||
RDEPEND==sys-kernel/coreos-modules-4.14.61
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.60
|
||||
SLOT=0/4.14.61
|
||||
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=b06e416b987a33bf039f3788ebb4a943
|
||||
@ -1,12 +1,12 @@
|
||||
DEFINED_PHASES=compile configure install prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-modules-4.17.12 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.17.12
|
||||
DEPEND==sys-kernel/coreos-modules-4.17.13 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.17.13
|
||||
DESCRIPTION=CoreOS Linux kernel
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND==sys-kernel/coreos-modules-4.17.12
|
||||
RDEPEND==sys-kernel/coreos-modules-4.17.13
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.17.12
|
||||
SLOT=0/4.17.13
|
||||
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=b06e416b987a33bf039f3788ebb4a943
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.60
|
||||
DEPEND==sys-kernel/coreos-sources-4.14.61
|
||||
DESCRIPTION=CoreOS Linux kernel modules
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.14.60
|
||||
SLOT=0/4.14.61
|
||||
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=a88b250c5a7da995b47b632b9f99b8dd
|
||||
@ -1,5 +1,5 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
|
||||
DEPEND==sys-kernel/coreos-sources-4.17.12
|
||||
DEPEND==sys-kernel/coreos-sources-4.17.13
|
||||
DESCRIPTION=CoreOS Linux kernel modules
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kernel.org
|
||||
@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 freedist
|
||||
RDEPEND=!<sys-kernel/coreos-kernel-4.6.3-r1
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=0/4.17.12
|
||||
SLOT=0/4.17.13
|
||||
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=a88b250c5a7da995b47b632b9f99b8dd
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.14.60
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.60.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
SLOT=4.14.61
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.61.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=bf6f18079028c6f1bc98009663ef3db3
|
||||
@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
|
||||
LICENSE=GPL-2 linux-firmware
|
||||
RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
|
||||
RESTRICT=binchecks strip
|
||||
SLOT=4.17.12
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
|
||||
SLOT=4.17.13
|
||||
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.13.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
|
||||
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
|
||||
_md5_=93ddfff50fe890bb525bc9750f7114c1
|
||||
@ -2,7 +2,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION="-r1"
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel"
|
||||
@ -2,7 +2,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION="-r1"
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel"
|
||||
@ -2,7 +2,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION="-r1"
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel savedconfig
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel modules"
|
||||
@ -2,7 +2,7 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
COREOS_SOURCE_REVISION="-r1"
|
||||
COREOS_SOURCE_REVISION=""
|
||||
inherit coreos-kernel savedconfig
|
||||
|
||||
DESCRIPTION="CoreOS Linux kernel modules"
|
||||
@ -1,4 +1,4 @@
|
||||
DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
|
||||
DIST linux-4.17.tar.xz 102165892 SHA256 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db WHIRLPOOL 60573a6837a5daae91ea8d36f7aea0439a398d47810524df378b37df20ebb6fa83d518380348ec66cfe8f94b2405de59f884d52ac879cb4ff78f6674ad322077
|
||||
DIST patch-4.14.60.xz 1559132 SHA256 4cca9c6dfc779dff6dbefa5b7dea8874eb76f0131ab271b7d2f9d1d627d84b88 SHA512 884975454aac5cb69dcb0db68ab05a41a51f8ca9da7bf27bc012ef65b1020a71ed661feed80a9b9ee94b32bfc55bc9c563e0acb1023da46a3240565816673b4b WHIRLPOOL b8c1b2189936cb79cd2771f53e4dda4b6465dcaea8c3261760e0d3fccfd5dbe8c124c42ef54459eded39c77313180c142dfb8ab7087dfdc459cb4fd8a4e3d3e5
|
||||
DIST patch-4.17.12.xz 322464 SHA256 6ed482aa6bb72999434ca34de3081e798d4fc0ac79ec3e57af3a98927348ff99 SHA512 516270daaa65a0f40bf6202909fc1950a8c723b77d5a54089a72eb664c3708ece050c938230cdd3b1b3e281d73c1c5e909def5fe1e0c8ddecbf9fbd43713a3aa WHIRLPOOL 83d6eb3fbeacca1e3cc063925641de75e61df92599a73d4bbba65427092dea4c56a0e3f2adbd58eec03ec5be071a856f83e81bcd1e3b4da28ae6192de3b41c7a
|
||||
DIST patch-4.14.61.xz 1563008 SHA256 d15db64311d874f2e27927dc1f96e2dfea2899b104fd6af873c39fe50a1f2e29 SHA512 ef649ffed6c45ccd1b163649cc4cf1a281220cdd3227f4336fcf715e282b312a2068e5d69188ec28185e4a67d4a688c88eaf6030c4ec1460b7d601772f3527da WHIRLPOOL 964553a60140265d15d27a1dda29907a0018cf42e3887df33345d1073d713550cad5146769c2deed35fffc803c62f12ccea615c0aefaaf8bfb996c838bb02e20
|
||||
DIST patch-4.17.13.xz 329540 SHA256 5dbfce6d7ea2118919f98493136a9d8c7a09b87e11c2f7d66556d2d4127aff5c SHA512 8f77239c6c0393aa6e854f98d0ef0832e0a3e936251805ca1fcde2b5d24e0b086582f68e3f494a4a287b404573c26a867170958d53f3c1bf4c46c4c5697188b2 WHIRLPOOL 76fad83c04dba67db402f21e95a6960f03f3ca0fac204d04d43e3fc818c9bb82062ade65f2ce9e746067037e10b4d77688effd42117b8fd8703afbd1941d470a
|
||||
|
||||
@ -37,5 +37,4 @@ UNIPATCH_LIST="
|
||||
${PATCH_DIR}/z0004-xen-netfront-Fix-mismatched-rtnl_unlock.patch \
|
||||
${PATCH_DIR}/z0005-xen-netfront-Update-features-after-registering-netde.patch \
|
||||
${PATCH_DIR}/z0006-ext4-fix-false-negatives-and-false-positives-in-ext4.patch \
|
||||
${PATCH_DIR}/z0007-x86-entry-64-Remove-ebx-handling-from-error_entry-ex.patch \
|
||||
"
|
||||
@ -39,5 +39,4 @@ UNIPATCH_LIST="
|
||||
${PATCH_DIR}/z0002-Add-arm64-coreos-verity-hash.patch \
|
||||
${PATCH_DIR}/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
|
||||
${PATCH_DIR}/z0004-4.17.x-won-t-boot-due-to-x86-boot-compressed-64-Hand.patch \
|
||||
${PATCH_DIR}/z0005-x86-entry-64-Remove-ebx-handling-from-error_entry-ex.patch \
|
||||
"
|
||||
@ -1,7 +1,7 @@
|
||||
From 741a20d2c9ab8fe50df1fbb1d3fd95b22f77065b Mon Sep 17 00:00:00 2001
|
||||
From 4b4a02b29057e300c1ed74e24ea4abbb102638af Mon Sep 17 00:00:00 2001
|
||||
From: Vito Caputo <vito.caputo@coreos.com>
|
||||
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
||||
Subject: [PATCH 1/7] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
Subject: [PATCH 1/6] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
|
||||
This enables relocating source and build trees to different roots,
|
||||
provided they stay reachable relative to one another. Useful for
|
||||
@ -12,7 +12,7 @@ by some undesirable path component.
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5b48ec630990..7ba527640db3 100644
|
||||
index 4bd65eabd298..25f92146ae1c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0e0d8f76240259b590047c39768ddbfe1695d313 Mon Sep 17 00:00:00 2001
|
||||
From d1daad1551c22635c0b185be6242186fddc2e111 Mon Sep 17 00:00:00 2001
|
||||
From: Geoff Levand <geoff@infradead.org>
|
||||
Date: Fri, 11 Nov 2016 17:28:52 -0800
|
||||
Subject: [PATCH 2/7] Add arm64 coreos verity hash
|
||||
Subject: [PATCH 2/6] Add arm64 coreos verity hash
|
||||
|
||||
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d14e8b24ed70176794ab95521cc62f5cb14175de Mon Sep 17 00:00:00 2001
|
||||
From 3bbb0203d38748870cfe5e6729f035f5c9e27853 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <david.michael@coreos.com>
|
||||
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
||||
Subject: [PATCH 3/7] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
Subject: [PATCH 3/6] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
new GCCs
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b65e40359a4d927c704ad7170dd7b6e77d3aaaa4 Mon Sep 17 00:00:00 2001
|
||||
From 80f99295b0056628cad1a94b5e5f7e0ba529e24a Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:20 +0100
|
||||
Subject: [PATCH 4/7] xen-netfront: Fix mismatched rtnl_unlock
|
||||
Subject: [PATCH 4/6] xen-netfront: Fix mismatched rtnl_unlock
|
||||
|
||||
Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
|
||||
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From db8a5080561668bdd8cc989c8c02e2dddb42e7b8 Mon Sep 17 00:00:00 2001
|
||||
From 54dce3fb3edcefa80e6007a5ee6a612272adff79 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Lagerwall <ross.lagerwall@citrix.com>
|
||||
Date: Thu, 21 Jun 2018 14:00:21 +0100
|
||||
Subject: [PATCH 5/7] xen-netfront: Update features after registering netdev
|
||||
Subject: [PATCH 5/6] xen-netfront: Update features after registering netdev
|
||||
|
||||
Update the features after calling register_netdev() otherwise the
|
||||
device features are not set up correctly and it not possible to change
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9768a3646f317194d886fd7369d265f3907ddb73 Mon Sep 17 00:00:00 2001
|
||||
From 2a32248fe5410a7c051d7676732001193e23cc31 Mon Sep 17 00:00:00 2001
|
||||
From: Theodore Ts'o <tytso@mit.edu>
|
||||
Date: Sun, 8 Jul 2018 19:35:02 -0400
|
||||
Subject: [PATCH 6/7] ext4: fix false negatives *and* false positives in
|
||||
Subject: [PATCH 6/6] ext4: fix false negatives *and* false positives in
|
||||
ext4_check_descriptors()
|
||||
|
||||
commit 44de022c4382541cebdd6de4465d1f4f465ff1dd upstream.
|
||||
|
||||
@ -1,133 +0,0 @@
|
||||
From 127c328736c4a8a91faf7845e99e7bbfdd248cf2 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Lutomirski <luto@kernel.org>
|
||||
Date: Sun, 22 Jul 2018 11:05:09 -0700
|
||||
Subject: [PATCH 7/7] x86/entry/64: Remove %ebx handling from error_entry/exit
|
||||
|
||||
error_entry and error_exit communicate the user vs. kernel status of
|
||||
the frame using %ebx. This is unnecessary -- the information is in
|
||||
regs->cs. Just use regs->cs.
|
||||
|
||||
This makes error_entry simpler and makes error_exit more robust.
|
||||
|
||||
It also fixes a nasty bug. Before all the Spectre nonsense, the
|
||||
xen_failsafe_callback entry point returned like this:
|
||||
|
||||
ALLOC_PT_GPREGS_ON_STACK
|
||||
SAVE_C_REGS
|
||||
SAVE_EXTRA_REGS
|
||||
ENCODE_FRAME_POINTER
|
||||
jmp error_exit
|
||||
|
||||
And it did not go through error_entry. This was bogus: RBX
|
||||
contained garbage, and error_exit expected a flag in RBX.
|
||||
|
||||
Fortunately, it generally contained *nonzero* garbage, so the
|
||||
correct code path was used. As part of the Spectre fixes, code was
|
||||
added to clear RBX to mitigate certain speculation attacks. Now,
|
||||
depending on kernel configuration, RBX got zeroed and, when running
|
||||
some Wine workloads, the kernel crashes. This was introduced by:
|
||||
|
||||
commit 3ac6d8c787b8 ("x86/entry/64: Clear registers for exceptions/interrupts, to reduce speculation attack surface")
|
||||
|
||||
With this patch applied, RBX is no longer needed as a flag, and the
|
||||
problem goes away.
|
||||
|
||||
I suspect that malicious userspace could use this bug to crash the
|
||||
kernel even without the offending patch applied, though.
|
||||
|
||||
[ Historical note: I wrote this patch as a cleanup before I was aware
|
||||
of the bug it fixed. ]
|
||||
|
||||
[ Note to stable maintainers: this should probably get applied to all
|
||||
kernels. If you're nervous about that, a more conservative fix to
|
||||
add xorl %ebx,%ebx; incl %ebx before the jump to error_exit should
|
||||
also fix the problem. ]
|
||||
|
||||
Reported-and-tested-by: M. Vefa Bicakci <m.v.b@runbox.com>
|
||||
Signed-off-by: Andy Lutomirski <luto@kernel.org>
|
||||
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Cc: Borislav Petkov <bp@alien8.de>
|
||||
Cc: Brian Gerst <brgerst@gmail.com>
|
||||
Cc: Dave Hansen <dave.hansen@linux.intel.com>
|
||||
Cc: Denys Vlasenko <dvlasenk@redhat.com>
|
||||
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
|
||||
Cc: Greg KH <gregkh@linuxfoundation.org>
|
||||
Cc: H. Peter Anvin <hpa@zytor.com>
|
||||
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
||||
Cc: Juergen Gross <jgross@suse.com>
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: xen-devel@lists.xenproject.org
|
||||
Fixes: 3ac6d8c787b8 ("x86/entry/64: Clear registers for exceptions/interrupts, to reduce speculation attack surface")
|
||||
Link: http://lkml.kernel.org/r/b5010a090d3586b2d6e06c7ad3ec5542d1241c45.1532282627.git.luto@kernel.org
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
---
|
||||
arch/x86/entry/entry_64.S | 18 ++++--------------
|
||||
1 file changed, 4 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
|
||||
index f7bfa701219b..0fae7096ae23 100644
|
||||
--- a/arch/x86/entry/entry_64.S
|
||||
+++ b/arch/x86/entry/entry_64.S
|
||||
@@ -933,7 +933,7 @@ ENTRY(\sym)
|
||||
|
||||
call \do_sym
|
||||
|
||||
- jmp error_exit /* %ebx: no swapgs flag */
|
||||
+ jmp error_exit
|
||||
.endif
|
||||
END(\sym)
|
||||
.endm
|
||||
@@ -1166,7 +1166,6 @@ END(paranoid_exit)
|
||||
|
||||
/*
|
||||
* Save all registers in pt_regs, and switch GS if needed.
|
||||
- * Return: EBX=0: came from user mode; EBX=1: otherwise
|
||||
*/
|
||||
ENTRY(error_entry)
|
||||
UNWIND_HINT_FUNC
|
||||
@@ -1213,7 +1212,6 @@ ENTRY(error_entry)
|
||||
* for these here too.
|
||||
*/
|
||||
.Lerror_kernelspace:
|
||||
- incl %ebx
|
||||
leaq native_irq_return_iret(%rip), %rcx
|
||||
cmpq %rcx, RIP+8(%rsp)
|
||||
je .Lerror_bad_iret
|
||||
@@ -1247,28 +1245,20 @@ ENTRY(error_entry)
|
||||
|
||||
/*
|
||||
* Pretend that the exception came from user mode: set up pt_regs
|
||||
- * as if we faulted immediately after IRET and clear EBX so that
|
||||
- * error_exit knows that we will be returning to user mode.
|
||||
+ * as if we faulted immediately after IRET.
|
||||
*/
|
||||
mov %rsp, %rdi
|
||||
call fixup_bad_iret
|
||||
mov %rax, %rsp
|
||||
- decl %ebx
|
||||
jmp .Lerror_entry_from_usermode_after_swapgs
|
||||
END(error_entry)
|
||||
|
||||
-
|
||||
-/*
|
||||
- * On entry, EBX is a "return to kernel mode" flag:
|
||||
- * 1: already in kernel mode, don't need SWAPGS
|
||||
- * 0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
|
||||
- */
|
||||
ENTRY(error_exit)
|
||||
UNWIND_HINT_REGS
|
||||
DISABLE_INTERRUPTS(CLBR_ANY)
|
||||
TRACE_IRQS_OFF
|
||||
- testl %ebx, %ebx
|
||||
- jnz retint_kernel
|
||||
+ testb $3, CS(%rsp)
|
||||
+ jz retint_kernel
|
||||
jmp retint_user
|
||||
END(error_exit)
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1565054e3925885a5a727c59145485eb928b65c8 Mon Sep 17 00:00:00 2001
|
||||
From 0ed694cd4354a9c32f4d352bfab431a2b9d494d2 Mon Sep 17 00:00:00 2001
|
||||
From: Vito Caputo <vito.caputo@coreos.com>
|
||||
Date: Wed, 25 Nov 2015 02:59:45 -0800
|
||||
Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
Subject: [PATCH 1/4] kbuild: derive relative path for KBUILD_SRC from CURDIR
|
||||
|
||||
This enables relocating source and build trees to different roots,
|
||||
provided they stay reachable relative to one another. Useful for
|
||||
@ -12,7 +12,7 @@ by some undesirable path component.
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 790e8faf0ddc..780b8757cd8d 100644
|
||||
index 2534e51de1db..ffda2668f9d6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d1a996e00fc7b58bfffc3cfcd807c9dde2949634 Mon Sep 17 00:00:00 2001
|
||||
From 110966b0617ebb45d2161523fbc60bac075b11aa Mon Sep 17 00:00:00 2001
|
||||
From: Geoff Levand <geoff@infradead.org>
|
||||
Date: Fri, 11 Nov 2016 17:28:52 -0800
|
||||
Subject: [PATCH 2/5] Add arm64 coreos verity hash
|
||||
Subject: [PATCH 2/4] Add arm64 coreos verity hash
|
||||
|
||||
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 178edc68fcd926a894972ea889b5265428fdc5ac Mon Sep 17 00:00:00 2001
|
||||
From b1549d2ddae4a6eee1e36ac45fdb26bd6be0d0f0 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <david.michael@coreos.com>
|
||||
Date: Thu, 8 Feb 2018 21:23:12 -0500
|
||||
Subject: [PATCH 3/5] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
Subject: [PATCH 3/4] tools/objtool/Makefile: Don't fail on fallthrough with
|
||||
new GCCs
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 61ceb2881ae20ce661b4cc28cf7369bfccae9086 Mon Sep 17 00:00:00 2001
|
||||
From 83e720dae3d730f010a2d4ff9776d7a9f1dbb155 Mon Sep 17 00:00:00 2001
|
||||
From: "Kirill A. Shutemov" <kirill@shutemov.name>
|
||||
Date: Wed, 4 Jul 2018 18:08:57 +0300
|
||||
Subject: [PATCH 4/5] 4.17.x won't boot due to "x86/boot/compressed/64: Handle
|
||||
Subject: [PATCH 4/4] 4.17.x won't boot due to "x86/boot/compressed/64: Handle
|
||||
5-level paging boot if kernel is above 4G"
|
||||
|
||||
On Tue, Jul 03, 2018 at 05:21:50PM +0300, Kirill A. Shutemov wrote:
|
||||
|
||||
@ -1,133 +0,0 @@
|
||||
From c9017bec96f9cdd3c9434b44e0d28da2c8573b47 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Lutomirski <luto@kernel.org>
|
||||
Date: Sun, 22 Jul 2018 11:05:09 -0700
|
||||
Subject: [PATCH 5/5] x86/entry/64: Remove %ebx handling from error_entry/exit
|
||||
|
||||
error_entry and error_exit communicate the user vs. kernel status of
|
||||
the frame using %ebx. This is unnecessary -- the information is in
|
||||
regs->cs. Just use regs->cs.
|
||||
|
||||
This makes error_entry simpler and makes error_exit more robust.
|
||||
|
||||
It also fixes a nasty bug. Before all the Spectre nonsense, the
|
||||
xen_failsafe_callback entry point returned like this:
|
||||
|
||||
ALLOC_PT_GPREGS_ON_STACK
|
||||
SAVE_C_REGS
|
||||
SAVE_EXTRA_REGS
|
||||
ENCODE_FRAME_POINTER
|
||||
jmp error_exit
|
||||
|
||||
And it did not go through error_entry. This was bogus: RBX
|
||||
contained garbage, and error_exit expected a flag in RBX.
|
||||
|
||||
Fortunately, it generally contained *nonzero* garbage, so the
|
||||
correct code path was used. As part of the Spectre fixes, code was
|
||||
added to clear RBX to mitigate certain speculation attacks. Now,
|
||||
depending on kernel configuration, RBX got zeroed and, when running
|
||||
some Wine workloads, the kernel crashes. This was introduced by:
|
||||
|
||||
commit 3ac6d8c787b8 ("x86/entry/64: Clear registers for exceptions/interrupts, to reduce speculation attack surface")
|
||||
|
||||
With this patch applied, RBX is no longer needed as a flag, and the
|
||||
problem goes away.
|
||||
|
||||
I suspect that malicious userspace could use this bug to crash the
|
||||
kernel even without the offending patch applied, though.
|
||||
|
||||
[ Historical note: I wrote this patch as a cleanup before I was aware
|
||||
of the bug it fixed. ]
|
||||
|
||||
[ Note to stable maintainers: this should probably get applied to all
|
||||
kernels. If you're nervous about that, a more conservative fix to
|
||||
add xorl %ebx,%ebx; incl %ebx before the jump to error_exit should
|
||||
also fix the problem. ]
|
||||
|
||||
Reported-and-tested-by: M. Vefa Bicakci <m.v.b@runbox.com>
|
||||
Signed-off-by: Andy Lutomirski <luto@kernel.org>
|
||||
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Cc: Borislav Petkov <bp@alien8.de>
|
||||
Cc: Brian Gerst <brgerst@gmail.com>
|
||||
Cc: Dave Hansen <dave.hansen@linux.intel.com>
|
||||
Cc: Denys Vlasenko <dvlasenk@redhat.com>
|
||||
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
|
||||
Cc: Greg KH <gregkh@linuxfoundation.org>
|
||||
Cc: H. Peter Anvin <hpa@zytor.com>
|
||||
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
||||
Cc: Juergen Gross <jgross@suse.com>
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: xen-devel@lists.xenproject.org
|
||||
Fixes: 3ac6d8c787b8 ("x86/entry/64: Clear registers for exceptions/interrupts, to reduce speculation attack surface")
|
||||
Link: http://lkml.kernel.org/r/b5010a090d3586b2d6e06c7ad3ec5542d1241c45.1532282627.git.luto@kernel.org
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
---
|
||||
arch/x86/entry/entry_64.S | 18 ++++--------------
|
||||
1 file changed, 4 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
|
||||
index 3166b9674429..b9699e63ceda 100644
|
||||
--- a/arch/x86/entry/entry_64.S
|
||||
+++ b/arch/x86/entry/entry_64.S
|
||||
@@ -981,7 +981,7 @@ ENTRY(\sym)
|
||||
|
||||
call \do_sym
|
||||
|
||||
- jmp error_exit /* %ebx: no swapgs flag */
|
||||
+ jmp error_exit
|
||||
.endif
|
||||
END(\sym)
|
||||
.endm
|
||||
@@ -1222,7 +1222,6 @@ END(paranoid_exit)
|
||||
|
||||
/*
|
||||
* Save all registers in pt_regs, and switch GS if needed.
|
||||
- * Return: EBX=0: came from user mode; EBX=1: otherwise
|
||||
*/
|
||||
ENTRY(error_entry)
|
||||
UNWIND_HINT_FUNC
|
||||
@@ -1269,7 +1268,6 @@ ENTRY(error_entry)
|
||||
* for these here too.
|
||||
*/
|
||||
.Lerror_kernelspace:
|
||||
- incl %ebx
|
||||
leaq native_irq_return_iret(%rip), %rcx
|
||||
cmpq %rcx, RIP+8(%rsp)
|
||||
je .Lerror_bad_iret
|
||||
@@ -1303,28 +1301,20 @@ ENTRY(error_entry)
|
||||
|
||||
/*
|
||||
* Pretend that the exception came from user mode: set up pt_regs
|
||||
- * as if we faulted immediately after IRET and clear EBX so that
|
||||
- * error_exit knows that we will be returning to user mode.
|
||||
+ * as if we faulted immediately after IRET.
|
||||
*/
|
||||
mov %rsp, %rdi
|
||||
call fixup_bad_iret
|
||||
mov %rax, %rsp
|
||||
- decl %ebx
|
||||
jmp .Lerror_entry_from_usermode_after_swapgs
|
||||
END(error_entry)
|
||||
|
||||
-
|
||||
-/*
|
||||
- * On entry, EBX is a "return to kernel mode" flag:
|
||||
- * 1: already in kernel mode, don't need SWAPGS
|
||||
- * 0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
|
||||
- */
|
||||
ENTRY(error_exit)
|
||||
UNWIND_HINT_REGS
|
||||
DISABLE_INTERRUPTS(CLBR_ANY)
|
||||
TRACE_IRQS_OFF
|
||||
- testl %ebx, %ebx
|
||||
- jnz retint_kernel
|
||||
+ testb $3, CS(%rsp)
|
||||
+ jz retint_kernel
|
||||
jmp retint_user
|
||||
END(error_exit)
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user