diff --git a/.gitignore b/.gitignore index 37b1aff..9a9e938 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ SOURCES/kernel-abi-whitelists-693.tar.bz2 -SOURCES/linux-3.10.0-693.el7.tar.xz +SOURCES/linux-3.10.0-693.1.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 54ab56b..1e38adb 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,7 +1,4 @@ 4cddbe6531170fad4a6dd31f10512e6bd4298fbd SOURCES/kernel-abi-whitelists-693.tar.bz2 -3cf4ee84ddc99fe2be527ed2673cec934f9133fe SOURCES/linux-3.10.0-693.el7.tar.xz +fe2f9a8f4863b0d2e5b7a3edbbdfd8d66d869bc0 SOURCES/linux-3.10.0-693.1.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 7aa4228..af9341a 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 +BUILD:=693.1.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm @@ -38,7 +38,6 @@ endif $(info BUILDID is "$(BUILDID)". Update '$(shell dirname $(REDHAT))/localversion' to change.) PKGRELEASE:=$(PREBUILD)$(BUILD)$(DIST)$(BUILDID) -SPECRELEASE:=$(PREBUILD)$(BUILD)%{?dist}$(BUILDID) TARFILE:=linux-$(KVERSION)-$(PKGRELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) diff --git a/SOURCES/Module.kabi_dup_ppc64 b/SOURCES/Module.kabi_dup_ppc64 index e69de29..06b42a2 100644 --- a/SOURCES/Module.kabi_dup_ppc64 +++ b/SOURCES/Module.kabi_dup_ppc64 @@ -0,0 +1,34 @@ +0xcb7c59b0 I_BDEV vmlinux EXPORT_SYMBOL +0x7180886c bio_integrity_add_page vmlinux EXPORT_SYMBOL +0xaaaa6b0e bio_integrity_alloc vmlinux EXPORT_SYMBOL +0xb88d23fb bio_map_user vmlinux EXPORT_SYMBOL +0x14057466 bio_unmap_user vmlinux EXPORT_SYMBOL +0xe3188091 d_genocide vmlinux EXPORT_SYMBOL +0xef19e74c dput vmlinux EXPORT_SYMBOL +0x2fd06dd9 fget vmlinux EXPORT_SYMBOL +0x6f20960a full_name_hash vmlinux EXPORT_SYMBOL +0xb8193777 get_user_pages_fast vmlinux EXPORT_SYMBOL_GPL +0x4f41d4d9 ilookup5 vmlinux EXPORT_SYMBOL +0x114af44f kern_mount_data vmlinux EXPORT_SYMBOL_GPL +0x3ccb3dca kern_unmount vmlinux EXPORT_SYMBOL +0x9a4a8ef8 kill_anon_super vmlinux EXPORT_SYMBOL +0x211b58f3 kill_litter_super vmlinux EXPORT_SYMBOL +0x92bc220b lockref_get vmlinux EXPORT_SYMBOL +0x4e3567f7 match_int vmlinux EXPORT_SYMBOL +0x44e9a829 match_token vmlinux EXPORT_SYMBOL +0xcb2c153a mount_nodev vmlinux EXPORT_SYMBOL +0x996eb45e mount_pseudo vmlinux EXPORT_SYMBOL +0x4d103d21 new_inode vmlinux EXPORT_SYMBOL +0xe5ffcb94 noop_fsync vmlinux EXPORT_SYMBOL +0xb9735a57 register_filesystem vmlinux EXPORT_SYMBOL +0xfd2ebb60 remove_proc_entry vmlinux EXPORT_SYMBOL +0x598c0a8f set_nlink vmlinux EXPORT_SYMBOL +0xb39d7182 set_page_dirty_lock vmlinux EXPORT_SYMBOL +0xd1b03dc0 simple_dir_inode_operations vmlinux EXPORT_SYMBOL +0x4c5951fa simple_dir_operations vmlinux EXPORT_SYMBOL +0xd582ec83 simple_getattr vmlinux EXPORT_SYMBOL +0xb7dfddcd simple_lookup vmlinux EXPORT_SYMBOL +0xee076ae8 simple_statfs vmlinux EXPORT_SYMBOL +0x82c3a896 simple_unlink vmlinux EXPORT_SYMBOL +0x55b649dd unlock_new_inode vmlinux EXPORT_SYMBOL +0x6358c954 unregister_filesystem vmlinux EXPORT_SYMBOL diff --git a/SOURCES/Module.kabi_dup_ppc64le b/SOURCES/Module.kabi_dup_ppc64le index e69de29..cbfcc41 100644 --- a/SOURCES/Module.kabi_dup_ppc64le +++ b/SOURCES/Module.kabi_dup_ppc64le @@ -0,0 +1,34 @@ +0x8687aed5 I_BDEV vmlinux EXPORT_SYMBOL +0x3cfa01e9 bio_integrity_add_page vmlinux EXPORT_SYMBOL +0x6242b66e bio_integrity_alloc vmlinux EXPORT_SYMBOL +0x87d618cf bio_map_user vmlinux EXPORT_SYMBOL +0x0f5a59a3 bio_unmap_user vmlinux EXPORT_SYMBOL +0x60f6c717 d_genocide vmlinux EXPORT_SYMBOL +0x6cf7a0ca dput vmlinux EXPORT_SYMBOL +0x7858e4ee fget vmlinux EXPORT_SYMBOL +0x6f20960a full_name_hash vmlinux EXPORT_SYMBOL +0xc0c3031d get_user_pages_fast vmlinux EXPORT_SYMBOL_GPL +0x495e7024 ilookup5 vmlinux EXPORT_SYMBOL +0xe88e86fe kern_mount_data vmlinux EXPORT_SYMBOL_GPL +0x0f45dc5a kern_unmount vmlinux EXPORT_SYMBOL +0x66179b9e kill_anon_super vmlinux EXPORT_SYMBOL +0xdd464d95 kill_litter_super vmlinux EXPORT_SYMBOL +0x92bc220b lockref_get vmlinux EXPORT_SYMBOL +0x4e3567f7 match_int vmlinux EXPORT_SYMBOL +0x44e9a829 match_token vmlinux EXPORT_SYMBOL +0x30d2e230 mount_nodev vmlinux EXPORT_SYMBOL +0x51821157 mount_pseudo vmlinux EXPORT_SYMBOL +0x20c7776f new_inode vmlinux EXPORT_SYMBOL +0xdfa70f73 noop_fsync vmlinux EXPORT_SYMBOL +0x3b117411 register_filesystem vmlinux EXPORT_SYMBOL +0x31d930e1 remove_proc_entry vmlinux EXPORT_SYMBOL +0xf4bef10a set_nlink vmlinux EXPORT_SYMBOL +0x354bbe0b set_page_dirty_lock vmlinux EXPORT_SYMBOL +0x8714b5ff simple_dir_inode_operations vmlinux EXPORT_SYMBOL +0x89f7d7c9 simple_dir_operations vmlinux EXPORT_SYMBOL +0xb1c3330d simple_getattr vmlinux EXPORT_SYMBOL +0x17f7b041 simple_lookup vmlinux EXPORT_SYMBOL +0x8a46b566 simple_statfs vmlinux EXPORT_SYMBOL +0xc2e30154 simple_unlink vmlinux EXPORT_SYMBOL +0x5fac7a06 unlock_new_inode vmlinux EXPORT_SYMBOL +0xe13ae712 unregister_filesystem vmlinux EXPORT_SYMBOL diff --git a/SOURCES/Module.kabi_dup_s390x b/SOURCES/Module.kabi_dup_s390x index e69de29..6f0f75a 100644 --- a/SOURCES/Module.kabi_dup_s390x +++ b/SOURCES/Module.kabi_dup_s390x @@ -0,0 +1,34 @@ +0xfdb309fd I_BDEV vmlinux EXPORT_SYMBOL +0x8b296578 bio_integrity_add_page vmlinux EXPORT_SYMBOL +0x341ede72 bio_integrity_alloc vmlinux EXPORT_SYMBOL +0xbbd0ab2d bio_map_user vmlinux EXPORT_SYMBOL +0xfe56bc26 bio_unmap_user vmlinux EXPORT_SYMBOL +0x58b544e2 d_genocide vmlinux EXPORT_SYMBOL +0x15a91e1b dput vmlinux EXPORT_SYMBOL +0xc9c735f0 fget vmlinux EXPORT_SYMBOL +0x6f20960a full_name_hash vmlinux EXPORT_SYMBOL +0xed61f0a2 get_user_pages_fast vmlinux EXPORT_SYMBOL_GPL +0xb8d4636b ilookup5 vmlinux EXPORT_SYMBOL +0xdc1fec67 kern_mount_data vmlinux EXPORT_SYMBOL_GPL +0x732a5f21 kern_unmount vmlinux EXPORT_SYMBOL +0x7e8bb9b1 kill_anon_super vmlinux EXPORT_SYMBOL +0xe4c9be89 kill_litter_super vmlinux EXPORT_SYMBOL +0xbabb3227 lockref_get vmlinux EXPORT_SYMBOL +0x4e3567f7 match_int vmlinux EXPORT_SYMBOL +0x44e9a829 match_token vmlinux EXPORT_SYMBOL +0xb400bc3f mount_nodev vmlinux EXPORT_SYMBOL +0xcf6a3165 mount_pseudo vmlinux EXPORT_SYMBOL +0x03f7a17f new_inode vmlinux EXPORT_SYMBOL +0x94d58556 noop_fsync vmlinux EXPORT_SYMBOL +0xcc514abb register_filesystem vmlinux EXPORT_SYMBOL +0xb98eaa18 remove_proc_entry vmlinux EXPORT_SYMBOL +0x735e4010 set_nlink vmlinux EXPORT_SYMBOL +0xe2843f6a set_page_dirty_lock vmlinux EXPORT_SYMBOL +0xa5ee3596 simple_dir_inode_operations vmlinux EXPORT_SYMBOL +0x04fef602 simple_dir_operations vmlinux EXPORT_SYMBOL +0x4eae61cf simple_getattr vmlinux EXPORT_SYMBOL +0xa5de6721 simple_lookup vmlinux EXPORT_SYMBOL +0x0f8ab5a7 simple_statfs vmlinux EXPORT_SYMBOL +0x665ca3ae simple_unlink vmlinux EXPORT_SYMBOL +0x0c585d58 unlock_new_inode vmlinux EXPORT_SYMBOL +0x82844443 unregister_filesystem vmlinux EXPORT_SYMBOL diff --git a/SOURCES/Module.kabi_dup_x86_64 b/SOURCES/Module.kabi_dup_x86_64 index e69de29..b452be3 100644 --- a/SOURCES/Module.kabi_dup_x86_64 +++ b/SOURCES/Module.kabi_dup_x86_64 @@ -0,0 +1,42 @@ +0xde5e21e5 I_BDEV vmlinux EXPORT_SYMBOL +0xbdfb6dbb __fentry__ vmlinux EXPORT_SYMBOL +0x6729d3df __get_user_4 vmlinux EXPORT_SYMBOL +0x6d334118 __get_user_8 vmlinux EXPORT_SYMBOL +0xb2fd5ceb __put_user_4 vmlinux EXPORT_SYMBOL +0xf0fdf6cb __stack_chk_fail vmlinux EXPORT_SYMBOL +0x3588d8ba _raw_qspin_lock_irq vmlinux EXPORT_SYMBOL +0x5cc58d08 bio_integrity_add_page vmlinux EXPORT_SYMBOL +0x1b5501d1 bio_integrity_alloc vmlinux EXPORT_SYMBOL +0x50bb2e16 bio_map_user vmlinux EXPORT_SYMBOL +0x49150706 bio_unmap_user vmlinux EXPORT_SYMBOL +0xb7073a6a d_genocide vmlinux EXPORT_SYMBOL +0xa3a1832f dput vmlinux EXPORT_SYMBOL +0x09185525 fget vmlinux EXPORT_SYMBOL +0x6f20960a full_name_hash vmlinux EXPORT_SYMBOL +0x31a6c1a4 get_user_pages_fast vmlinux EXPORT_SYMBOL_GPL +0x843b364e ilookup5 vmlinux EXPORT_SYMBOL +0xf482d525 kern_mount_data vmlinux EXPORT_SYMBOL_GPL +0xbc42731d kern_unmount vmlinux EXPORT_SYMBOL +0x4c4fef19 kernel_stack vmlinux EXPORT_SYMBOL +0x2e99f239 kill_anon_super vmlinux EXPORT_SYMBOL +0x985ec4a3 kill_litter_super vmlinux EXPORT_SYMBOL +0x52cbb014 lockref_get vmlinux EXPORT_SYMBOL +0x4e3567f7 match_int vmlinux EXPORT_SYMBOL +0x44e9a829 match_token vmlinux EXPORT_SYMBOL +0x0258b1c5 mount_nodev vmlinux EXPORT_SYMBOL +0x169ca28e mount_pseudo vmlinux EXPORT_SYMBOL +0xd434cca4 new_inode vmlinux EXPORT_SYMBOL +0xa67c1caf noop_fsync vmlinux EXPORT_SYMBOL +0x784213a6 pv_lock_ops vmlinux EXPORT_SYMBOL +0x97e1f970 register_filesystem vmlinux EXPORT_SYMBOL +0xa16aae11 remove_proc_entry vmlinux EXPORT_SYMBOL +0xfd5cf105 set_nlink vmlinux EXPORT_SYMBOL +0x62b1ada0 set_page_dirty_lock vmlinux EXPORT_SYMBOL +0xa549c7f5 simple_dir_inode_operations vmlinux EXPORT_SYMBOL +0xe0d8ba54 simple_dir_operations vmlinux EXPORT_SYMBOL +0xc62409b8 simple_getattr vmlinux EXPORT_SYMBOL +0x4d99dd9f simple_lookup vmlinux EXPORT_SYMBOL +0x520dda72 simple_statfs vmlinux EXPORT_SYMBOL +0x98fca85f simple_unlink vmlinux EXPORT_SYMBOL +0xeebd4852 unlock_new_inode vmlinux EXPORT_SYMBOL +0xd235532c unregister_filesystem vmlinux EXPORT_SYMBOL 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 24d9535..d01ab2b 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -12,12 +12,9 @@ Summary: The Linux kernel %global distro_build 693 %define rpmversion 3.10.0 -%define pkgrelease 693.el7 +%define pkgrelease 693.1.1.el7 -# allow pkg_release to have configurable %{?dist} tag -%define specrelease 693%{?dist} - -%define pkg_release %{specrelease}%{?buildid} +%define pkg_release %{pkgrelease}%{?buildid} # The kernel tarball/base version %define rheltarball %{rpmversion}-%{pkgrelease} @@ -67,7 +64,7 @@ Summary: The Linux kernel %define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} # Control whether we perform a compat. check against DUP ABI. -%define with_kabidupchk %{?_with_kabidupchk: 1} %{?!_with_kabidupchk: 0} +%define with_kabidupchk 1 # should we do C=1 builds with sparse %define with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0} @@ -362,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 @@ -409,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 @@ -573,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. @@ -720,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. @@ -881,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 @@ -1591,8 +1582,10 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Mon Jul 31 2017 CentOS Sources - 3.10.0-693.el7.centos -- Apply debranding changes +* Thu Aug 03 2017 Alexander Gordeev [3.10.0-693.1.1.el7] +- [fs] dentry name snapshots (Miklos Szeredi) [1471131 1470403] {CVE-2017-7533} +- [fs] fix the regression from "direct-io: Fix negative return from dio read beyond eof" (Eric Sandeen) [1475669 1473549] +- [fs] direct-io: Fix negative return from dio read beyond eof (Eric Sandeen) [1475669 1473549] * Thu Jul 06 2017 Rafael Aquini [3.10.0-693.el7] - [x86] crypto: sha1-ssse3 - Disable avx2 (Benjamin Coddington) [1346106]