From 7af7965c790a66868456b0dd5b508f6bdade8b68 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Apr 06 2022 06:43:55 +0000 Subject: kernel-plus: update to 3.10.0-1160.62.1.el7.centos.plus Signed-off-by: Akemi Yagi --- diff --git a/.kernel.metadata b/.kernel.metadata index 8840663..9214c75 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,3 +1,3 @@ ba5599148e52ecd126ebcf873672e26d3288323e SOURCES/kernel-abi-whitelists-1160.tar.bz2 5000b85c42ef87b6835dd8eef063e4623c2e0fa9 SOURCES/kernel-kabi-dw-1160.tar.bz2 -067116f32efd75ed80a10e29c2d30e1af6245a5a SOURCES/linux-3.10.0-1160.59.1.el7.tar.xz +ae38e757aefd508c279c4bf633e340549903d48d SOURCES/linux-3.10.0-1160.62.1.el7.tar.xz diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index c9491f1..2ac2780 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:=1160.59.1 +BUILD:=1160.62.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index cd4b1c6..b9e04f4 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -20,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.59.1.el7 +%define pkgrelease 1160.62.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.59.1%{?dist} +%define specrelease 1160.62.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -430,8 +430,8 @@ Source16: centossecureboot201.crt %define pesign_name_0 centossecureboot001 %define pesign_name_1 centossecureboot201 %endif -#Source17: centos-ldup.x509 -#Source18: centos-kpatch.x509 +Source17: centos-ldup.x509 +Source18: centos-kpatch.x509 Source19: check-kabi @@ -1827,15 +1827,15 @@ if [ -x %{_sbindir}/weak-modules ]\ then\ %{_sbindir}/weak-modules --add-kernel %{KVRA}%{?1:.%{1}} || exit $?\ fi\ -%{_sbindir}/new-kernel-pkg --package kernel-plus%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --update %{KVRA}%{?-v:.%{-v*}} \ +%{_sbindir}/new-kernel-pkg --package kernel-plus%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVRA}%{?-v:.%{-v*}} \ rc=$?\ if [ $rc != 0 ]; then\ %{_sbindir}/new-kernel-pkg --remove %{KVRA}%{?1:.%{1}}\ ERROR_MSG="ERROR: installing kernel-%{KVRA}%{?1:.%{1}}: no space left for creating initramfs. Clean up /boot partition and re-run '%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVRA}%{?-v:.%{-v*}}'"\ if [ -e /usr/bin/logger ]; then\ /usr/bin/logger -p syslog.warn "\$ERROR_MSG"\ - elif [ -e /usr/bin/cat ]; then\ - /usr/bin/cat "\$ERROR_MSG" > /dev/kmsg\ + else\ + echo "\$ERROR_MSG" > /dev/kmsg\ fi\ echo "\$ERROR_MSG"\ exit $rc\ @@ -1857,9 +1857,6 @@ if [ `uname -i` == "x86_64" ] &&\ [ -f /etc/sysconfig/kernel ]; then\ /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ -%{expand:\ -%{_sbindir}/new-kernel-pkg --package kernel-plus%{?-v:-%{-v*}} --install %{KVRA}%{?-v:.%{-v*}} || exit $?\ -}\ %{nil} # @@ -2117,7 +2114,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Tue Feb 22 2022 Akemi Yagi [3.10.0-1160.59.1.el7.centos.plus] +* Tue Apr 05 2022 Akemi Yagi [3.10.0-1160.62.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2178,6 +2175,43 @@ fi - wireguard added - UEFI disabled in 32-bit kernel +* Wed Mar 23 2022 Rado Vrbovsky [3.10.0-1160.62.1.el7] +- cifs: fix handling of DFS links where we can not access all components (Ronnie Sahlberg) [1937304] +- redhat: kernel.spec: install new kernel boot entry in posttrans, not post (Denys Vlasenko) [1893756] +- [s390] s390/cpumf: Support for CPU Measurement Facility CSVN 7 (Mete Durlu) [2048920] +- dm table: fix iterate_devices based device capability checks (Mike Snitzer) [2054743] +- buffer: eliminate the need to call free_more_memory() in __getblk_slow() (Carlos Maiolino) [2030609] +- buffer: grow_dev_page() should use __GFP_NOFAIL for all cases (Carlos Maiolino) [2030609] +- buffer: have alloc_page_buffers() use __GFP_NOFAIL (Carlos Maiolino) [2030609] +- mm: memcg: do not fail __GFP_NOFAIL charges (Rafael Aquini) [2054345] +- mm: filemap: do not drop action modifier flags from the gfp_mask passed to __add_to_page_cache_locked() (Rafael Aquini) [2054345] +- Added ZSTREAM=yes to makefile (Lucas Zampieri) + +* Mon Mar 07 2022 Rado Vrbovsky [3.10.0-1160.61.1.el7] +- x86/efi: reset the correct tlb_state when returning from efi_switch_mm() (Rafael Aquini) [2055587] + +* Wed Feb 23 2022 Rado Vrbovsky [3.10.0-1160.60.1.el7] +- svcrdma: Fix leak of svc_rdma_recv_ctxt objects (Benjamin Coddington) [2028740] +- sunrpc: Remove unneeded pointer dereference (Benjamin Coddington) [2028740] +- x86/platform/uv: Add more to secondary CPU kdump info (Frank Ramsay) [2042462] +- [s390] s390/AP: support new dynamic AP bus size limit (Claudio Imbrenda) [1997156] +- CI: Enable baseline realtime checks (Veronika Kabatova) +- CI: Rename pipelines to include release names (Veronika Kabatova) +- RDMA/cma: Do not change route.addr.src_addr.ss_family (Kamal Heib) [2032075] {CVE-2021-4028} +- fget: clarify and improve __fget_files() implementation (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fget: check that the fd still exists after getting a ref to it (Miklos Szeredi) [2032478] {CVE-2021-4083} +- net: Set fput_needed iff FDPUT_FPUT is set (Miklos Szeredi) [2032478] {CVE-2021-4083} +- vfs, fdtable: Add fget_task helper (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fs: add fget_many() and fput_many() (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fs/file.c: __fget() and dup2() atomicity rules (Miklos Szeredi) [2032478] {CVE-2021-4083} +- vfs: Don't let __fdget_pos() get FMODE_PATH files (Miklos Szeredi) [2032478] {CVE-2021-4083} +- get rid of fget_light() (Miklos Szeredi) [2032478] {CVE-2021-4083} +- sockfd_lookup_light(): switch to fdget^W^Waway from fget_light (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fs: __fget_light() can use __fget() in slow path (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fs: factor out common code in fget_light() and fget_raw_light() (Miklos Szeredi) [2032478] {CVE-2021-4083} +- fs: factor out common code in fget() and fget_raw() (Miklos Szeredi) [2032478] {CVE-2021-4083} +- introduce __fcheck_files() to fix rcu_dereference_check_fdtable(), kill rcu_my_thread_group_empty() (Miklos Szeredi) [2032478] {CVE-2021-4083} + * Wed Feb 16 2022 Rado Vrbovsky [3.10.0-1160.59.1.el7] - Revert "Merge: Fix tasks stuck in IO waiting for buffer_head lock" (Rado Vrbovsky) [2030609]