diff --git a/.gitignore b/.gitignore index 29867ca..5440f26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ SOURCES/kernel-abi-whitelists-693.tar.bz2 -SOURCES/linux-3.10.0-693.17.1.el7.tar.xz +SOURCES/linux-3.10.0-693.21.1.el7.tar.xz SOURCES/rheldup3.x509 SOURCES/rhelkpatch1.x509 -SOURCES/centos-kpatch.x509 -SOURCES/centos-ldup.x509 -SOURCES/centos.cer diff --git a/.kernel.metadata b/.kernel.metadata index 80d7490..13e15f0 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,7 +1,4 @@ 4cddbe6531170fad4a6dd31f10512e6bd4298fbd SOURCES/kernel-abi-whitelists-693.tar.bz2 -0cb69c0ea0f10f9e6a37a491b48502b839dc306b SOURCES/linux-3.10.0-693.17.1.el7.tar.xz +43853d8a8a8c9ff26f3efc87757a197321f83e79 SOURCES/linux-3.10.0-693.21.1.el7.tar.xz 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 -5a7d05a8298cf38d43689470e8e43230d8add0f9 SOURCES/centos-kpatch.x509 -c61172887746663d3bdd9acaa263cbfacf99e8b3 SOURCES/centos-ldup.x509 -6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index c2c1320..e70fbcb 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/Makefile.common @@ -9,7 +9,7 @@ RPMVERSION:=3.10.0 # marker is git tag which we base off of for exporting patches MARKER:=v3.10 PREBUILD:= -BUILD:=693.17.1 +BUILD:=693.21.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch deleted file mode 100644 index 739855c..0000000 --- a/SOURCES/debrand-rh-i686-cpu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/boot/main.c 2014-06-04 10:05:04.000000000 -0700 -+++ b/arch/x86/boot/main.c 2014-07-09 12:54:40.000000000 -0700 -@@ -146,7 +146,7 @@ void main(void) - - /* Make sure we have all the proper CPU support */ - if (validate_cpu()) { -- puts("This processor is unsupported in RHEL7.\n"); -+ puts("This processor is unsupported in CentOS 7.\n"); - die(); - } - diff --git a/SOURCES/debrand-rh_taint.patch b/SOURCES/debrand-rh_taint.patch deleted file mode 100644 index 8ef4557..0000000 --- a/SOURCES/debrand-rh_taint.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69c0d42cfa26515196896dea086857c2caccb6eb Mon Sep 17 00:00:00 2001 -From: Jim Perrin -Date: Thu, 19 Jun 2014 10:05:12 -0500 -Subject: [PATCH] branding patch for rh_taint - ---- - kernel/rh_taint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c -index 59a74b0..0708e15 100644 ---- a/kernel/rh_taint.c -+++ b/kernel/rh_taint.c -@@ -8,7 +8,7 @@ - void mark_hardware_unsupported(const char *msg) - { - /* Print one single message */ -- pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg); -+ pr_crit("Warning: %s - this hardware has not undergone upstream testing. Please consult http://wiki.centos.org/FAQ for more information\n", msg); - } - EXPORT_SYMBOL(mark_hardware_unsupported); - --- -1.8.3.1 - diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch deleted file mode 100644 index 9d2e08b..0000000 --- a/SOURCES/debrand-single-cpu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 66185f5c6f881847776702e3a7956c504400f4f2 Mon Sep 17 00:00:00 2001 -From: Jim Perrin -Date: Thu, 19 Jun 2014 09:53:13 -0500 -Subject: [PATCH] branding patch for single-cpu systems - ---- - arch/x86/kernel/setup.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index b289118..9d25982 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -846,7 +846,7 @@ static void rh_check_supported(void) - if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) && - !x86_hyper && !cpu_has_hypervisor && !is_kdump_kernel()) { - pr_crit("Detected single cpu native boot.\n"); -- pr_crit("Important: In Red Hat Enterprise Linux 7, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems."); -+ pr_crit("Important: In CentOS 7, single threaded, single CPU 64-bit physical systems are unsupported. Please see http://wiki.centos.org/FAQ for more information"); - } - - /* The RHEL7 kernel does not support this hardware. The kernel will --- -1.8.3.1 - diff --git a/SOURCES/kernel-3.10.0-x86_64-debug.config b/SOURCES/kernel-3.10.0-x86_64-debug.config index 84d4d24..ec93005 100644 --- a/SOURCES/kernel-3.10.0-x86_64-debug.config +++ b/SOURCES/kernel-3.10.0-x86_64-debug.config @@ -383,6 +383,7 @@ CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y +CONFIG_RETPOLINE=y CONFIG_INTEL_RDT_A=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set @@ -1518,6 +1519,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m diff --git a/SOURCES/kernel-3.10.0-x86_64.config b/SOURCES/kernel-3.10.0-x86_64.config index c6a4d48..d4d5ddf 100644 --- a/SOURCES/kernel-3.10.0-x86_64.config +++ b/SOURCES/kernel-3.10.0-x86_64.config @@ -388,6 +388,7 @@ CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y +CONFIG_RETPOLINE=y CONFIG_INTEL_RDT_A=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set @@ -1522,6 +1523,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey index d98f8fe..b1bbe38 100644 --- a/SOURCES/x509.genkey +++ b/SOURCES/x509.genkey @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = CentOS -CN = CentOS Linux kernel signing key -emailAddress = security@centos.org +O = Red Hat +CN = Red Hat Enterprise Linux kernel signing key +emailAddress = secalert@redhat.com [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index fce0af1..3afe70e 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -12,7 +12,7 @@ Summary: The Linux kernel %global distro_build 693 %define rpmversion 3.10.0 -%define pkgrelease 693.17.1.el7 +%define pkgrelease 693.21.1.el7 %define pkg_release %{pkgrelease}%{?buildid} @@ -359,16 +359,16 @@ Source10: sign-modules Source11: x509.genkey Source12: extra_certificates %if %{?released_kernel} -Source13: centos.cer +Source13: securebootca.cer Source14: secureboot.cer %define pesign_name redhatsecureboot301 %else -Source13: centos.cer -Source14: secureboot.cer +Source13: redhatsecurebootca2.cer +Source14: redhatsecureboot003.cer %define pesign_name redhatsecureboot003 %endif -Source15: centos-ldup.x509 -Source16: centos-kpatch.x509 +Source15: rheldup3.x509 +Source16: rhelkpatch1.x509 Source18: check-kabi @@ -406,9 +406,6 @@ Source9999: lastcommit.stat # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: debrand-single-cpu.patch -Patch1001: debrand-rh_taint.patch -Patch1002: debrand-rh-i686-cpu.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -570,11 +567,11 @@ kernel-gcov includes the gcov graph and source files for gcov coverage collectio %endif %package -n kernel-abi-whitelists -Summary: The CentOS Linux kernel ABI symbol whitelists +Summary: The Red Hat Enterprise Linux kernel ABI symbol whitelists Group: System Environment/Kernel AutoReqProv: no %description -n kernel-abi-whitelists -The kABI package contains information pertaining to the CentOS +The kABI package contains information pertaining to the Red Hat Enterprise Linux kernel ABI, including lists of kernel symbols that are needed by external Linux kernel modules, and a yum plugin to aid enforcement. @@ -717,9 +714,6 @@ cd linux-%{KVRA} cp $RPM_SOURCE_DIR/kernel-%{version}-*.config . ApplyOptionalPatch linux-kernel-test.patch -ApplyOptionalPatch debrand-single-cpu.patch -ApplyOptionalPatch debrand-rh_taint.patch -ApplyOptionalPatch debrand-rh-i686-cpu.patch # Any further pre-build tree manipulations happen here. @@ -878,7 +872,7 @@ BuildKernel() { fi # EFI SecureBoot signing, x86_64-only %ifarch x86_64 - %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13} + %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE14} -n %{pesign_name} mv $KernelImage.signed $KernelImage %endif $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer @@ -1588,8 +1582,109 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Jan 25 2018 CentOS Sources - 3.10.0-693.17.1.el7 -- Apply debranding changes +* Fri Feb 23 2018 Denys Vlasenko [3.10.0-693.21.1.el7] +- [x86] platform/uv: Mark tsc_check_sync as an init function (Frank Ramsay) [1547870 1526066] +- [x86] platform/uv: Add check of TSC state set by UV BIOS (Frank Ramsay) [1547870 1526066] +- [x86] tsc: Provide a means to disable TSC ART (Frank Ramsay) [1547870 1526066] +- [x86] tsc: Drastically reduce the number of firmware bug warnings (Frank Ramsay) [1547870 1526066] +- [x86] tsc: Skip TSC test and error messages if already unstable (Frank Ramsay) [1547870 1526066] +- [x86] tsc: Add option that TSC on Socket 0 being non-zero is valid (Frank Ramsay) [1547870 1526066] +- [x86] tsc: Remove the TSC_ADJUST clamp (Frank Ramsay) [1547870 1526066] + +* Wed Feb 07 2018 Denys Vlasenko [3.10.0-693.20.1.el7] +- [x86] locking/qspinlock: Fix kabi problem in a non-KVM/XEN VM (Waiman Long) [1539797 1533529] + +* Thu Feb 01 2018 Denys Vlasenko [3.10.0-693.19.1.el7] +- [watchdog] hpwdt: remove indirect call in drivers/watchdog/hpwdt.c (Josh Poimboeuf) [1539649 1535644] +- [kernel] x86/spec_ctrl: cleanup __ptrace_may_access (Josh Poimboeuf) [1539649 1535644] +- [x86] bugs: Drop one "mitigation" from dmesg (Josh Poimboeuf) [1539649 1535644] +- [x86] kvm: vmx: Make indirect call speculation safe (Josh Poimboeuf) [1539649 1535644] +- [x86] kvm: x86: Make indirect calls in emulator speculation safe (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline: Optimize inline assembler for vmexit_fill_RSB (Josh Poimboeuf) [1539649 1535644] +- [x86] mce: Make machine check speculation protected (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: fix ptrace IBPB optimization (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: Avoid returns in IBRS-disabled regions (Josh Poimboeuf) [1539649 1535644] +- [x86] spectre/meltdown: avoid the vulnerability directory to weaken kernel security (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: Document retpolines and ibrs_enabled=3 (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: upgrade GCC retpoline warning to an error (Josh Poimboeuf) [1539649 1535644] +- [x86] Use IBRS for firmware update path (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: stuff RSB on context switch with SMEP enabled (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: enforce sane combinations of IBRS and retpoline (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: use upstream RSB stuffing function (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: add ibrs_enabled=3 (ibrs_user) (Josh Poimboeuf) [1539649 1535644] +- [kernel] x86/jump_label: warn on failed jump label patch (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: detect unretpolined modules (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline: Add LFENCE to the retpoline/RSB filling RSB macros (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline: Fill return stack buffer on vmexit (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline/xen: Convert Xen hypercall indirect jumps (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline/hyperv: Convert assembler indirect jumps (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline/ftrace: Convert ftrace assembler indirect jumps (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline/entry: Convert entry assembler indirect jumps (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline/crypto: Convert crypto assembler indirect jumps (Josh Poimboeuf) [1539649 1535644] +- [x86] retpoline: Add initial retpoline support (Josh Poimboeuf) [1539649 1535644] +- [x86] jump_label: add asm support for static keys (Josh Poimboeuf) [1539649 1535644] +- [x86] asm: Make asm/alternative.h safe from assembly (Josh Poimboeuf) [1539649 1535644] +- [tools] objtool: Support new GCC 6 switch jump table pattern (Josh Poimboeuf) [1539649 1535644] +- [tools] objtool: Detect jumps to retpoline thunks (Josh Poimboeuf) [1539649 1535644] +- [x86] spectre: Add boot time option to select Spectre v2 mitigation (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: print features changed by microcode loading (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: refactor the init and microcode loading paths (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: move initialization of X86_FEATURE_IBPB_SUPPORT (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: remove SPEC_CTRL_PCP_IBPB bit (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: remove ibrs_enabled variable (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: add ibp_disabled variable (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: add X86_FEATURE_IBP_DISABLE (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: remove IBP disable for AMD model 0x16 (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: remove performance measurements from documentation (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: make ipbp_enabled read-only (Josh Poimboeuf) [1539649 1535644] +- [x86] spec_ctrl: remove ibpb_enabled=2 mode (Josh Poimboeuf) [1539649 1535644] +- [x86] cpu: Implement CPU vulnerabilites sysfs functions (Josh Poimboeuf) [1539649 1535644] +- [base] sysfs/cpu: Add vulnerability folder (Josh Poimboeuf) [1539649 1535644] +- [x86] cpu: Merge bugs.c and bugs_64.c (Josh Poimboeuf) [1539649 1535644] +- [x86] syscall: int80 must not clobber r12-15 (Josh Poimboeuf) [1539649 1535644] +- [x86] syscall: change ia32_syscall() to create the full register frame in ia32_do_call() (Josh Poimboeuf) [1539649 1535644] +- [x86] boot: Add early cmdline parsing for options with arguments (Josh Poimboeuf) [1539649 1535644] +- [x86] boot: Pass in size to early cmdline parsing (Josh Poimboeuf) [1539649 1535644] +- [x86] boot: Simplify early command line parsing (Josh Poimboeuf) [1539649 1535644] +- [x86] boot: Fix early command-line parsing when partial word matches (Josh Poimboeuf) [1539649 1535644] +- [x86] boot: Fix early command-line parsing when matching at end (Josh Poimboeuf) [1539649 1535644] +- [scsi] storvsc: Fix scsi_cmd error assignments in storvsc_handle_error (Cathy Avery) [1536978 1502601] +- [fs] nfs: RPC_MAX_AUTH_SIZE is in bytes ("J. Bruce Fields") [1533378 1495321] +- [fs] nfsd: give out fewer session slots as limit approaches (Dave Wysochanski) [1533377 1492234] +- [fs] nfsd: increase DRC cache limit (Dave Wysochanski) [1533377 1492234] +- [x86] kvm: x86: fix RSM when PCID is non-zero (Paolo Bonzini) [1531662 1530711] +- [x86] iommu/amd: Reduce delay waiting for command buffer space (Suravee Suthikulpanit) [1531456 1508644] +- [x86] iommu/amd: Reduce amount of MMIO when submitting commands (Suravee Suthikulpanit) [1531456 1508644] +- [x86] amd: Remove cmd_buf_size and evt_buf_size from struct amd_iommu (Suravee Suthikulpanit) [1531456 1508644] +- [x86] amd: Fix the left value check of cmd buffer (Suravee Suthikulpanit) [1531456 1508644] +- [x86] amd: Don't put completion-wait semaphore on stack (Suravee Suthikulpanit) [1531456 1508644] +- [x86] kvm: svm: obey guest PAT (Suravee Suthikulpanit) [1530976 1478185] +- [tty] serial: 8250_pci: Add Amazon PCI serial device ID (Vitaly Kuznetsov) [1530137 1527545] +- [ata] libata: sata_down_spd_limit should return if driver has not recorded sstatus speed (David Milburn) [1530136 1457140] +- [fs] nfs: fix a deadlock in nfs client initialization (Scott Mayhew) [1530135 1506382] +- [fs] nfsv4.0: Fix a lock leak in nfs40_walk_client_list (Scott Mayhew) [1530135 1506382] +- [fs] nfs: Create a common nfs4_match_client() function (Scott Mayhew) [1530135 1506382] +- [fs] autofs - revert: take more care to not update last_used on path walk (Ian Kent) [1525994 1489542] +- [vhost] vhost_net: correctly check tx avail during rx busy polling (Jason Wang) [1523784 1487551] +- [crypto] shash - Fix has_key setting (Herbert Xu) [1522932 1505817] +- [block] Fix a race between blk_cleanup_queue() and timeout handling (Ming Lei) [1522698 1513725] +- [x86] tsc: Force TSC_ADJUST register to value >= zero (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Validate cpumask pointer before accessing it (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Try to adjust TSC if sync test fails (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Prepare warp test for TSC adjustment (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Move sync cleanup to a safe place (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Sync test only for the first cpu in a package (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Verify TSC_ADJUST from idle (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Store and check TSC ADJUST MSR (Prarit Bhargava) [1519850 1497055] +- [x86] tsc: Detect random warps (Prarit Bhargava) [1519850 1497055] +- [x86] kvm: mmu: always terminate page walks at level 1 (Paolo Bonzini) [1500382 1500381] {CVE-2017-12188} +- [x86] kvm: nVMX: update last_nonleaf_level when initializing nested EPT (Denys Vlasenko) [1500382 1500381] {CVE-2017-12188} +- [x86] kvm: fix singlestepping over syscall (Paolo Bonzini) [1464480 1464481] {CVE-2017-7518} + +* Sun Jan 21 2018 Denys Vlasenko [3.10.0-693.18.1.el7] +- [md] raid5: fix a race condition in stripe batch (Nigel Croxon) [1535883 1496836] +- [security] selinux: fix double free in selinux_parse_opts_str() (Paul Moore) [1532288 1456843] +- [fs] nfs: revert "nfs: Move the flock open mode check into nfs_flock()" (Benjamin Coddington) [1531095 1497225] * Sun Jan 14 2018 Denys Vlasenko [3.10.0-693.17.1.el7] - [s390] locking/barriers: remove old gmb() macro definition (Denys Vlasenko) [1519788 1519786]