diff --git a/Makefile.common b/Makefile.common index ff03054e71c8aa1a0749a00e6858ac5bf8ea7afa..f7acf4f40587fa1901717dafca3af9e0c1038f51 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.76.1 +BUILD:=1160.80.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..fc5c65ee18de0a0c321f8fc7f14f732699c9413f --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7 diff --git a/download b/download index 66bc55d6fddb75762ffa250f817a8af12d26a71d..b7696310e817b74e9dfb7e749500997b80d2f3db 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ dd4c41c2b2b5e2237fa63282e7bbdd7c kernel-abi-whitelists-1160.tar.bz2 85ce224ff3a41d590b5d0a5f7aa08bab kernel-kabi-dw-1160.tar.bz2 -d0056f0af1fd94b2b7124f2f4c9ef1ec linux-3.10.0-1160.76.1.el7.tar.xz +45af58f50f5cc081c6d4ff35844232bb linux-3.10.0-1160.80.1.el7.tar.xz diff --git a/kernel.spec b/kernel.spec index 2dd1df7cf4a5712cb31f469a1f07e78c8737dada..1cd8a5a3bb90b49cb05bb71859ba649de622e2c3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2,6 +2,7 @@ %global __spec_install_pre %{___build_pre} Summary: The Linux kernel + %define anolis_release .0.1 %define dist .an7 @@ -20,10 +21,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.76.1.el7 +%define pkgrelease 1160.80.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.76.1%{anolis_release}%{?dist} +%define specrelease 1160.80.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1804,9 +1805,68 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Aug 25 2022 maqi [3.10.0-1160.76.1.0.1.an7] +* Fri Nov 04 2022 yangxianzhao [3.10.0-1160.80.1.0.1.an7] - Modified dist -- Cherry-pick [21940b3] + +* Sat Oct 08 2022 Rado Vrbovsky [3.10.0-1160.80.1.el7] +- scsi: lpfc: Fix FCP I/O flush functionality for TMF routines (Dick Kennedy) [1969988] +- scsi: lpfc: Fix illegal memory access on Abort IOCBs (Dick Kennedy) [1969988] +- NFS: Fix extra call to dput() in nfs_prime_dcache (Benjamin Coddington) [2117856] + +* Thu Sep 22 2022 Rado Vrbovsky [3.10.0-1160.79.1.el7] +- x86/speculation: Add LFENCE to RSB fill sequence (Rafael Aquini) [2115073] {CVE-2022-26373} +- x86/speculation: Protect against userspace-userspace spectreRSB (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/speculation: cope with spectre_v2=retpoline cmdline on retbleed-affected Intel CPUs (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- KVM: emulate: do not adjust size of fastop and setcc subroutines (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/kvm: fix FASTOP_SIZE when return thunks are enabled (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/speculation: Disable RRSBA behavior (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/kexec: Disable RET on kexec (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Do not enable IBPB-on-entry when IBPB is not supported (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Add Cannon lake to RETBleed affected CPU list (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpu/amd: Enumerate BTC_NO (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/common: Stamp out the stepping madness (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpu/amd: Add Spectral Chicken (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Do IBPB fallback check only once (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Add retbleed=ibpb (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Report Intel retbleed vulnerability (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Enable STIBP for JMP2RET (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Add AMD retbleed= boot parameter (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/bugs: Report AMD retbleed vulnerability (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86: Add magic AMD return-thunk (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86: Use return-thunk in asm code (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/sev: Avoid using __x86_return_thunk (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/vsyscall_emu/64: Don't use RET in vsyscall emulation (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/kvm: Fix SETcc emulation for return thunks (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86,objtool: Create .return_sites (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86: Undo return-thunk damage (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/retpoline: Use -mfunction-return (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpufeatures: Move RETPOLINE flags to word 11 (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- objtool: Add ELF writing capability (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86: Prepare asm files for straight-line-speculation (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86: Prepare inline-asm for straight-line-speculation (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/kvm: Fix fastop function ELF metadata (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/kvm: Move kvm_fastop_exception to .fixup section (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/vdso: Fix vDSO build if a retpoline is emitted (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpufeatures: Combine word 11 and 12 into a new scattered features word (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpufeatures: Carve out CQM features retrieval (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpufeatures: Re-tabulate the X86_FEATURE definitions (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpufeature: Move processor tracing out of scattered features (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6 (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} +- x86/alternatives: Cleanup DPRINTK macro (Rafael Aquini) [2090227] {CVE-2022-23816 CVE-2022-23825 CVE-2022-29900 CVE-2022-29901} + +* Thu Sep 15 2022 Rado Vrbovsky [3.10.0-1160.78.1.el7] +- net_sched: cls_route: remove from list when handle is 0 (Davide Caratti) [2121809] {CVE-2022-2588} + +* Thu Sep 08 2022 Rado Vrbovsky [3.10.0-1160.77.1.el7] +- net/mlx5: Add Fast teardown support (Jay Shin) [2077711] +- net/mlx5: Free IRQs in shutdown path (Jay Shin) [2077711] +- net/mlx5: Change teardown with force mode failure message to warning (Jay Shin) [2077711] +- net/mlx5: Cancel health poll before sending panic teardown command (Jay Shin) [2077711] +- net/mlx5: Add fast unload support in shutdown flow (Jay Shin) [2077711] +- net/mlx5: Expose command polling interface (Jay Shin) [2077711] +- posix-timers: Remove remaining uses of tasklist_lock (Oleg Nesterov) [2115147] +- posix-timers: Use sighand lock instead of tasklist_lock on timer deletion (Oleg Nesterov) [2115147] +- posix-cpu-timers: remove tasklist_lock in posix_cpu_clock_get() (Oleg Nesterov) [2115147] * Tue Jul 26 2022 Rado Vrbovsky [3.10.0-1160.76.1.el7] - sfc: complete the next packet when we receive a timestamp (Íñigo Huguet) [1793280]