diff --git a/Makefile.common b/Makefile.common index 1d6d77304ec599abcfa4bfe71f60c5e1a2eae6d2..c725a4f50b3c72efd54ede96c1259420f8ecc2df 100644 --- a/Makefile.common +++ b/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.81.1 +BUILD:=1160.83.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/download b/download index 985f8ca9d50cc1dc85785c3278f96a5c1a44e37c..ece7f10eeb6eda719ce47b6faebcd6d46364d441 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ dd4c41c2b2b5e2237fa63282e7bbdd7c kernel-abi-whitelists-1160.tar.bz2 85ce224ff3a41d590b5d0a5f7aa08bab kernel-kabi-dw-1160.tar.bz2 -b4a34d5cc1c3461d940459f8047cf4f2 linux-3.10.0-1160.81.1.el7.tar.xz +28a66e2a375dd9b2738bf2a4a08bfbd9 linux-3.10.0-1160.83.1.el7.tar.xz diff --git a/kernel.spec b/kernel.spec index 266ded2e93f50e4bcc9ea66a631ec93b9001c33e..af1d0b5a6fe27b474a94300983ebedc9ca4a827a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,10 +1,9 @@ -%define anolis_release .0.1 # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} Summary: The Linux kernel -%define dist .an7 +%define dist .el7 # % define buildid .local @@ -21,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.81.1.el7 +%define pkgrelease 1160.83.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.81.1%{anolis_release}%{?dist} +%define specrelease 1160.83.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1805,8 +1804,20 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Wed Dec 14 2022 yangxianzhao [3.10.0-1160.81.1.0.1.an7] -- spec: modified dist +* Mon Dec 19 2022 Rado Vrbovsky [3.10.0-1160.83.1.el7] +- x86/sme: avoid using __x86_return_thunk (Rafael Aquini) [2122158] +- scsi: core: Simplify control flow in scmd_eh_abort_handler() (Ewan D. Milne) [2128337] +- scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run (Ewan D. Milne) [2128337] +- [netdrv] i40e: Fix freeing of uninitialized misc IRQ vector (Jamie Bainbridge) [2129248] +- x86/speculation: Use generic retpoline by default on AMD (Rafael Aquini) [2062165] {CVE-2021-26401} + +* Thu Dec 08 2022 Rado Vrbovsky [3.10.0-1160.82.1.el7] +- net: usb: ax88179_178a: Fix packet receiving (Jose Ignacio Tornos Martinez) [2120504] {CVE-2022-2964} +- net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup (Jose Ignacio Tornos Martinez) [2120504] {CVE-2022-2964} +- net: usb: Merge cpu_to_le32s + memcpy to put_unaligned_le32 (Jose Ignacio Tornos Martinez) [2120504] {CVE-2022-2964} +- ax88179_178a: Merge memcpy + le32_to_cpus to get_unaligned_le32 (Jose Ignacio Tornos Martinez) [2120504] {CVE-2022-2964} +- net: usb: ax88179_178a: fix packet alignment padding (Jose Ignacio Tornos Martinez) [2120504] {CVE-2022-2964} +- mm: swap: disable swap_vma_readahead for PPC64 (Rafael Aquini) [2142455] * Thu Nov 24 2022 Rado Vrbovsky [3.10.0-1160.81.1.el7] - [netdrv] bnxt: don't lock the tx queue from napi poll (Jamie Bainbridge) [2110869]