diff --git a/.gitignore b/.gitignore index 8bfc82e..c8aba13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -SOURCES/linux-3.10.0-123.13.2.el7.tar.xz +SOURCES/linux-3.10.0-123.20.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 954af9f..ab23f39 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,6 +1,3 @@ -564f060896bb7e638b47e9bef006354593b1bf02 SOURCES/linux-3.10.0-123.13.2.el7.tar.xz +d6b631955b09d82c781d44b543307b9e91467937 SOURCES/linux-3.10.0-123.20.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 6f07499..1b8118b 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:=123.13.2 +BUILD:=123.20.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/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 4621e16..b6ade6b 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -11,7 +11,7 @@ Summary: The Linux kernel %global released_kernel 1 %define rpmversion 3.10.0 -%define pkgrelease 123.13.2.el7 +%define pkgrelease 123.20.1.el7 %define pkg_release %{pkgrelease}%{?buildid} @@ -338,10 +338,10 @@ Source10: sign-modules %define modsign_cmd %{SOURCE10} Source11: x509.genkey Source12: extra_certificates -Source13: centos.cer +Source13: securebootca.cer Source14: secureboot.cer -Source15: centos-ldup.x509 -Source16: centos-kpatch.x509 +Source15: rheldup3.x509 +Source16: rhelkpatch1.x509 Source18: check-kabi @@ -369,9 +369,6 @@ Source2001: cpupower.config # 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 @@ -524,11 +521,11 @@ This package provides debug information for package kernel-tools. %endif # with_tools %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. @@ -671,12 +668,6 @@ cd linux-%{KVRA} # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/kernel-%{version}-*.config . -# CentOS Branding Modification -ApplyOptionalPatch debrand-rh_taint.patch -ApplyOptionalPatch debrand-single-cpu.patch -ApplyOptionalPatch debrand-rh-i686-cpu.patch -# End of CentOS Modification - ApplyOptionalPatch linux-kernel-test.patch # Any further pre-build tree manipulations happen here. @@ -828,7 +819,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 redhatsecureboot301 mv $KernelImage.signed $KernelImage %endif $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer @@ -1483,11 +1474,63 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Dec 18 2014 CentOS Sources - 3.10.0-123.13.2.el7 -- Apply debranding changes +* Wed Jan 21 2015 Phillip Lougher [3.10.0-123.20.1.el7] +- [fs] seq_file: don't include mm.h in genksyms calculation (Ian Kent) [1184152 1183280] -* Fri Dec 12 2014 Phillip Lougher [3.10.0-123.13.2.el7] +* Mon Dec 15 2014 Phillip Lougher [3.10.0-123.19.1.el7] +- [mm] shmem: fix splicing from a hole while it's punched (Denys Vlasenko) [1118244 1118245] {CVE-2014-4171} +- [mm] shmem: fix faulting into a hole, not taking i_mutex (Denys Vlasenko) [1118244 1118245] {CVE-2014-4171} +- [mm] shmem: fix faulting into a hole while it's punched (Denys Vlasenko) [118244 1118245] {CVE-2014-4171} - [x86] traps: stop using IST for #SS (Petr Matousek) [1172812 1172813] {CVE-2014-9322} +- [net] vxlan: fix incorrect initializer in union vxlan_addr (Daniel Borkmann) [1156611 1130643] +- [net] vxlan: fix crash when interface is created with no group (Daniel Borkmann) [1156611 1130643] +- [net] vxlan: fix nonfunctional neigh_reduce() (Daniel Borkmann) [1156611 1130643] +- [net] vxlan: fix potential NULL dereference in arp_reduce() (Daniel Borkmann) [1156611 1130643] +- [net] vxlan: remove unused port variable in vxlan_udp_encap_recv() (Daniel Borkmann) [1156611 1130643] +- [net] vxlan: remove extra newline after function definition (Daniel Borkmann) [1156611 1130643] +- [net] etherdevice: Use ether_addr_copy to copy an Ethernet address (Stefan Assmann) [1156611 1091126] +- [fs] splice: perform generic write checks (Eric Sandeen) [1163799 1155907] {CVE-2014-7822} +- [fs] eliminate BUG() call when there's an unexpected lock on file close (Frank Sorenson) [1172266 1148130] +- [net] sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet (Daniel Borkmann) [1163094 1154002] {CVE-2014-7841} +- [fs] lockd: Try to reconnect if statd has moved (Benjamin Coddington) [1150889 1120850] +- [fs] sunrpc: Don't wake tasks during connection abort (Benjamin Coddington) [1150889 1120850] +- [fs] cifs: NULL pointer dereference in SMB2_tcon (Jacob Tanenbaum) [1147528 1147529] {CVE-2014-7145} +- [net] ipv6: addrconf: implement address generation modes (Jiri Pirko) [1144876 1107369] +- [net] gre: add link local route when local addr is any (Jiri Pirko) [1144876 1107369] +- [net] gre6: don't try to add the same route two times (Jiri Pirko) [1144876 1107369] +- [fs] isofs: unbound recursion when processing relocated directories (Jacob Tanenbaum) [1142270 1142271] {CVE-2014-5471 CVE-2014-5472} +- [fs] fs: seq_file: fallback to vmalloc allocation (Ian Kent) [1140302 1095623] +- [fs] fs: /proc/stat: convert to single_open_size() (Ian Kent) [1140302 1095623] +- [fs] fs: seq_file: always clear m->count when we free m->buf (Ian Kent) [1140302 1095623] + +* Thu Dec 11 2014 Phillip Lougher [3.10.0-123.18.1.el7] +- [net] ipv6: fib: fix fib dump restart (Panu Matilainen) [1172795 1163605] +- [net] ipv6: drop unused fib6_clean_all_ro() function and rt6_proc_arg struct (Panu Matilainen) [1172795 1163605] +- [net] ipv6: avoid high order memory allocations for /proc/net/ipv6_route (Panu Matilainen) [1172795 1163605] +- [mm] numa: Remove BUG_ON() in __handle_mm_fault() (Rik van Riel) [1170662 1119439] +- [fs] aio: fix race between aio event completion and reaping (Jeff Moyer) [1154172 1131312] + +* Tue Nov 18 2014 Phillip Lougher [3.10.0-123.17.1.el7] +- [ethernet] mlx4: Protect port type setting by mutex (Amir Vadai) [1162733 1095345] + +* Mon Nov 17 2014 Phillip Lougher [3.10.0-123.16.1.el7] +- [fs] aio: block exit_aio() until all context requests are completed (Jeff Moyer) [1163992 1122092] +- [fs] aio: add missing smp_rmb() in read_events_ring (Jeff Moyer) [1154172 1131312] +- [fs] aio: fix reqs_available handling (Jeff Moyer) [1163992 1122092] +- [fs] aio: report error from io_destroy() when threads race in io_destroy() (Jeff Moyer) [1163992 1122092] +- [fs] aio: block io_destroy() until all context requests are completed (Jeff Moyer) [1163992 1122092] +- [fs] aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration (Jeff Moyer) [1163992 1122092] +- [fs] aio/migratepages: make aio migrate pages sane (Jeff Moyer) [1163992 1122092] +- [fs] aio: clean up and fix aio_setup_ring page mapping (Jeff Moyer) [1163992 1122092] + +* Wed Nov 12 2014 Phillip Lougher [3.10.0-123.15.1.el7] +- [scsi] ipr: wait for aborted command responses (Gustavo Duarte) [1162734 1156530] +- [scsi] reintroduce scsi_driver.init_command (Ewan Milne) [1146983 1105204] +- [block] implement an unprep function corresponding directly to prep (Ewan Milne) [1146983 1105204] +- [scsi] Revert: reintroduce scsi_driver.init_command (Ewan Milne) [1146983 1105204] + +* Tue Nov 11 2014 Phillip Lougher [3.10.0-123.14.1.el7] +- [fs] nfs: Fix another nfs4_sequence corruptor (Steve Dickson) [1162073 1111170] * Tue Nov 04 2014 Phillip Lougher [3.10.0-123.13.1.el7] - [powerpc] mm: Make sure a local_irq_disable prevent a parallel THP split (Don Zickus) [1151057 1083296]