From c8da8fb48c16844a0b35c36581f90906e2915d57 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 26 2019 10:40:53 +0000 Subject: import kernel-3.10.0-1062.7.1.el7 --- diff --git a/.gitignore b/.gitignore index 71c8578..97552e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ SOURCES/kernel-abi-whitelists-1062.tar.bz2 SOURCES/kernel-kabi-dw-1062.tar.bz2 -SOURCES/linux-3.10.0-1062.4.3.el7.tar.xz +SOURCES/linux-3.10.0-1062.7.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 53681ce..165ef5c 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,8 +1,5 @@ d6914bd8d9b24dcd384d2da39fa8b04fa3de713a SOURCES/kernel-abi-whitelists-1062.tar.bz2 e01030ef3029e113eeff62bf9ea0dcf09b86d4e2 SOURCES/kernel-kabi-dw-1062.tar.bz2 -7f0f72b72cdb167ab000b209c418081082561a72 SOURCES/linux-3.10.0-1062.4.3.el7.tar.xz +19f82752f9832c7bc39c816395264479bbb4b952 SOURCES/linux-3.10.0-1062.7.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 fc20ba2..fd9bd50 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:=1062.4.3 +BUILD:=1062.7.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/sign-modules b/SOURCES/sign-modules index bdb96a9..6262fe0 100755 --- a/SOURCES/sign-modules +++ b/SOURCES/sign-modules @@ -1,22 +1,23 @@ #! /bin/bash -moddir=$1 - -modules=`find $moddir -name *.ko` - MODSECKEY="./signing_key.priv" MODPUBKEY="./signing_key.x509" +moddir=$1 + +modules=`find $moddir -type f -name '*.ko'` -for mod in $modules -do - dir=`dirname $mod` - file=`basename $mod` +NPROC=`nproc` +[ -z "$NPROC" ] && NPROC=1 - ./scripts/sign-file sha256 ${MODSECKEY} ${MODPUBKEY} ${dir}/${file} - rm -f ${dir}/${file}.{sig,dig} +# NB: this loop runs 2000+ iterations. Try to be fast. +echo "$modules" | xargs -r -n16 -P $NPROC sh -c " +for mod; do + ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod + rm -f \$mod.sig \$mod.dig done +" DUMMYARG0 # xargs appends ARG1 ARG2..., which go into $mod in for loop. -RANDOMMOD=$(find $moddir -type f -name '*.ko' | sort -R | tail -n 1) +RANDOMMOD=$(echo "$modules" | sort -R | tail -n 1) if [ "~Module signature appended~" != "$(tail -c 28 $RANDOMMOD)" ]; then echo "*** Modules are unsigned! ***" exit 1 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 9ea7270..6fd53d5 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -14,10 +14,10 @@ Summary: The Linux kernel %global distro_build 1062 %define rpmversion 3.10.0 -%define pkgrelease 1062.4.3.el7 +%define pkgrelease 1062.7.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1062.4.3%{?dist} +%define specrelease 1062.7.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -396,16 +396,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 @@ -449,9 +449,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 @@ -635,11 +632,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. @@ -792,9 +789,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. @@ -953,7 +947,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 @@ -1308,7 +1302,7 @@ find Documentation -type d | xargs chmod u+w %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVRA} || exit 1 \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs xz; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | { NPROC=`nproc`; xargs -r -n16 -P ${NPROC:-1} xz; } \ fi \ %{nil} @@ -1776,13 +1770,8 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Wed Nov 13 2019 CentOS Sources - 3.10.0-1062.4.3.el7 -- Apply debranding changes - -* Tue Nov 12 2019 Bruno Meneguele [3.10.0-1062.4.3.el7] +* Wed Nov 13 2019 Bruno Meneguele [3.10.0-1062.7.1.el7] - [drm] drm/i915/cmdparser: Fix jump whitelist clearing (Dave Airlie) [1756882 1756883] {CVE-2019-0155} - -* Tue Nov 05 2019 Bruno Meneguele [3.10.0-1062.4.2.el7] - [drm] drm/i915: Lower RM timeout to avoid DSI hard hangs (Dave Airlie) [1756815 1756816] {CVE-2019-0154} - [drm] drm/i915/gen8+: Add RC6 CTX corruption WA (Dave Airlie) [1756815 1756816] {CVE-2019-0154} - [drm] drm/i915/cmdparser: Ignore Length operands during command matching (Dave Airlie) [1756882 1756883] {CVE-2019-0155} @@ -1820,6 +1809,88 @@ fi - [virt] kvm: Convert kvm_lock to a mutex (Paolo Bonzini) [1733009 1690343] {CVE-2018-12207} - [x86] kvm: mmu: drop vcpu param in gpte_access (Paolo Bonzini) [1733009 1690343] {CVE-2018-12207} - [virt] kvm: x86, powerpc: do not allow clearing largepages debugfs entry (Paolo Bonzini) [1733009 1690343] {CVE-2018-12207} +- [kernel] sched/fair: Fix endless loop in idle_balance() (Phil Auld) [1766087 1740941] +- [kernel] sched: Skip double execution of pick_next_task_fair() (Phil Auld) [1766098 1750819] +- [kernel] sched/fair: Prevent throttling in early pick_next_task_fair() (Phil Auld) [1756267 1740038] +- [kernel] sched: Check for stop task appearance when balancing happens (Phil Auld) [1756267 1740038] +- [kernel] sched/core: Fix endless loop in pick_next_task() (Phil Auld) [1756267 1740038] +- [kernel] sched/fair: Push down check for high priority class task into idle_balance() (Phil Auld) [1756267 1740038] +- [kernel] sched/rt: Fix picking RT and DL tasks from empty queue (Phil Auld) [1756267 1740038] +- [kernel] sched/core: Allow __sched_setscheduler() in interrupts when PI is not used (Phil Auld) [1756265 1722234] +- [kernel] sched, dl: Convert switched_{from, to}_dl() / prio_changed_dl() to balance callbacks (Phil Auld) [1756265 1722234] +- [kernel] sched,dl: Remove return value from pull_dl_task() (Phil Auld) [1756265 1722234] +- [kernel] sched, rt: Convert switched_{from, to}_rt() / prio_changed_rt() to balance callbacks (Phil Auld) [1756265 1722234] +- [kernel] sched,rt: Remove return value from pull_rt_task() (Phil Auld) [1756265 1722234] +- [kernel] sched: Allow balance callbacks for check_class_changed() (Phil Auld) [1756265 1722234] +- [kernel] sched: Use replace normalize_task() with __sched_setscheduler() (Phil Auld) [1756265 1722234] +- [kernel] sched: Handle priority boosted tasks proper in setscheduler() (Phil Auld) [1756265 1722234] +- [kernel] sched: Fix broken setscheduler() (Phil Auld) [1756265 1722234] +- [kernel] sched: Consider pi boosting in setscheduler() (Phil Auld) [1756265 1722234] +- [kernel] sched: Replace post_schedule with a balance callback list (Phil Auld) [1756265 1722234] +- [kernel] sched: Guarantee task priority in pick_next_task() (Phil Auld) [1756265 1722234] +- [kernel] sched: Remove some #ifdeffery (Phil Auld) [1756265 1722234] +- [kernel] sched: Clean up idle task SMP logic (Phil Auld) [1756265 1722234] +- [kernel] sched: Fix hotplug task migration (Phil Auld) [1756265 1722234] +- [kernel] sched/fair: Remove idle_balance() declaration in sched.h (Phil Auld) [1756265 1722234] +- [kernel] sched: Push down pre_schedule() and idle_balance() (Phil Auld) [1756265 1722234] +- [kernel] sched/fair: Optimize cgroup pick_next_task_fair() (Phil Auld) [1756265 1722234] +- [kernel] sched/fair: Clean up the __clear_buddies_*() functions (Phil Auld) [1756265 1722234] +- [kernel] sched: Push put_prev_task() into pick_next_task() (Phil Auld) [1756265 1722234] +- [kernel] sched: Move rq->idle_stamp up to the core (Phil Auld) [1756265 1722234] +- [kernel] sched: Fix race in idle_balance() (Phil Auld) [1756265 1722234] +- [kernel] sched: Remove 'cpu' parameter from idle_balance() (Phil Auld) [1756265 1722234] +- [kernel] sched/fair: Reset se-depth when task switched to FAIR (Phil Auld) [1756265 1722234] +- [kernel] sched/fair: Track cgroup depth (Phil Auld) [1756265 1722234] + +* Wed Oct 30 2019 Bruno Meneguele [3.10.0-1062.6.1.el7] +- [virt] KVM: coalesced_mmio: add bounds checking (Bandan Das) [1746797 1746798] {CVE-2019-14821} +- [fs] xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT (Brian Foster) [1764245 1759117] +- [powerpc] powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration (Desnes Augusto Nunes do Rosario) [1763625 1720930] +- [powerpc] powerpc/pseries/mobility: prevent cpu hotplug during DT update (Desnes Augusto Nunes do Rosario) [1763625 1720930] +- [powerpc] powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild (Desnes Augusto Nunes do Rosario) [1763625 1720930] +- [crypto] crypto: vmx - ghash: do nosimd fallback manually (Desnes Augusto Nunes do Rosario) [1763621 1739765] +- [crypto] crypto: vmx - Remove overly verbose printk from AES init routines (Desnes Augusto Nunes do Rosario) [1763621 1739765] +- [crypto] powerpc: Create disable_kernel_{fp, altivec, vsx, spe}() (Desnes Augusto Nunes do Rosario) [1763621 1739765] +- [crypto] crypto: vmx - CTR: always increment IV as quadword (Desnes Augusto Nunes do Rosario) [1763621 1739765] +- [crypto] crypto: vmx - fix copy-paste error in CTR mode (Desnes Augusto Nunes do Rosario) [1763621 1739765] +- [crypto] vmac - separate tfm and request context (Vladis Dronov) [1763620 1733561] +- [crypto] crypto: blkcipher - fix crash flushing dcache in error path (Vladis Dronov) [1761804 1741525] +- [crypto] crypto: remove direct blkcipher_walk dependency on transform (Vladis Dronov) [1761804 1741525] +- [crypto] crypto: user - prevent operating on larval algorithms (Vladis Dronov) [1761804 1741525] +- [netdrv] net/mlx5e: Support LAG TX port affinity distribution (Alaa Hleihel) [1759449 1724344] +- [netdrv] net/mlx5e: Expose new function for TIS destroy loop (Alaa Hleihel) [1759449 1724344] +- [include] net/mlx5: Add lag_tx_port_affinity capability bit (Alaa Hleihel) [1759449 1724344] +- [netdrv] net/mlx5e: Re-work TIS creation functions (Alaa Hleihel) [1759449 1724344] +- [netdrv] net/mlx5e: Disallow tc redirect offload cases we don't support (Alaa Hleihel) [1759003 1721626] +- [netdrv] net/mlx5e: Support ndo_get_phys_port_name for PF under switchdev mode (Alaa Hleihel) [1759003 1721626] +- [netdrv] net/mlx5e: Expose same physical switch_id for all representors (Alaa Hleihel) [1759003 1721626] +- [net] tcp: reset sk_send_head in tcp_write_queue_purge (Marcelo Leitner) [1748357 1748358] {CVE-2019-15239} +- [x86] kvm: x86: vmx: fix vpid leak (Vitaly Kuznetsov) [1755781 1716188] +- [kvm] kvm/x86: Move MSR_IA32_ARCH_CAPABILITIES to array emulated_msrs (Paul Lai) [1757757 1708465] +- [kvm] kvm: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts (Paul Lai) [1757757 1708465] +- [kvm] kvm: vmx: Tell the nested hypervisor to skip L1D flush on vmentry (Paul Lai) [1757757 1708465] +- [kvm] kvm: vmx: support MSR_IA32_ARCH_CAPABILITIES as a feature MSR (Paul Lai) [1757757 1708465] +- [kvm] kvm: x86: Introduce kvm_get_msr_feature() (Paul Lai) [1757757 1708465] +- [kvm] kvm: x86: Add a framework for supporting MSR-based features (Paul Lai) [1757757 1708465] +- [nvme] nvme: don't ask blk-mq to handle timed-out request (Ming Lei) [1758051 1750202] +- [block] blk-mq: mark request as REQ_TIMEOUT when .timeout() is called (Ming Lei) [1758051 1750202] +- [block] blk-mq: introduce blk_mq_clear_rq_complete() (Ming Lei) [1758051 1750202] +- [block] blk-mq: remove 'sync' argument from __blk_mq_complete_request() (Ming Lei) [1758051 1750202] +- [nvme] blk-mq: remove blk_mq_complete_request_sync (Ming Lei) [1763624 1730922] +- [nvme] nvme: wait until all completed request's complete fn is called (Ming Lei) [1763624 1730922] +- [nvme] nvme: don't abort completed request in nvme_cancel_request (Ming Lei) [1763624 1730922] +- [block] blk-mq: introduce blk_mq_tagset_wait_completed_request() (Ming Lei) [1763624 1730922] +- [block] blk-mq: introduce blk_mq_request_completed() (Ming Lei) [1763624 1730922] +- [scsi] scsi: qla2xxx: Use correct size in call to dma_free_coherent() in qla2400_sp_unmap() (Himanshu Madhani) [1759447 1668767] +- [scsi] scsi: qla2xxx: Fix different size DMA Alloc/Unmap (Himanshu Madhani) [1759447 1668767] +- [scsi] scsi: qla2xxx: Fix DMA unmap leak (Himanshu Madhani) [1759447 1668767] +- [scsi] scsi: qla2xxx: Prevent memory leak for CT req/rsp allocation (Himanshu Madhani) [1759447 1668767] +- [scsi] scsi: fnic: fix msix interrupt allocation (Govindarajulu Varadarajan) [1754836 1745053] +- [scsi] scsi: fnic: print port speed only at driver init or speed change (Govindarajulu Varadarajan) [1754836 1745053] +- [nvme] nvme-scsi: updating struct nvme_ctrl (Gopal Tiwari) [1752423 1749524] + +* Wed Oct 09 2019 Bruno Meneguele [3.10.0-1062.5.1.el7] +- [netdrv] ixgbe: Prevent u8 wrapping of ITR value to something less than 10us (Ken Cox) [1757350 1750856] * Wed Sep 25 2019 Bruno Meneguele [3.10.0-1062.4.1.el7] - [vhost] vhost: make sure log_num < in_num (Eugenio Perez) [1750879 1750880] {CVE-2019-14835}