Merge "Project import generated by Copybara." into 11.0.9
diff --git a/kernel-source/thirdparty/SOURCES/Makefile.common b/kernel-source/thirdparty/SOURCES/Makefile.common
index 2b095c4..e79e05a 100644
--- a/kernel-source/thirdparty/SOURCES/Makefile.common
+++ b/kernel-source/thirdparty/SOURCES/Makefile.common
@@ -9,7 +9,7 @@
# marker is git tag which we base off of for exporting patches
MARKER:=v3.10
PREBUILD:=
-BUILD:=1160.95.1
+BUILD:=1160.102.1
DIST:=.el7
SPECFILE:=kernel.spec
RPM:=$(REDHAT)/rpm
diff --git a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.102.1.el7.tar.xz b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.102.1.el7.tar.xz
new file mode 100644
index 0000000..38bb971
--- /dev/null
+++ b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.102.1.el7.tar.xz
Binary files differ
diff --git a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz
deleted file mode 100644
index 25ac57f..0000000
--- a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz
+++ /dev/null
Binary files differ
diff --git a/kernel-source/thirdparty/SPECS/kernel.spec b/kernel-source/thirdparty/SPECS/kernel.spec
index 843a380..3320f0a 100644
--- a/kernel-source/thirdparty/SPECS/kernel.spec
+++ b/kernel-source/thirdparty/SPECS/kernel.spec
@@ -20,10 +20,10 @@
%global distro_build 1160
%define rpmversion 3.10.0
-%define pkgrelease 1160.95.1.el7
+%define pkgrelease 1160.102.1.el7
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1160.95.1%{?dist}
+%define specrelease 1160.102.1%{?dist}
%define pkg_release %{specrelease}%{?buildid}
@@ -1810,6 +1810,55 @@
%kernel_variant_files %{with_kdump} kdump
%changelog
+* Mon Sep 25 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.102.1.el7]
+- net/sched: cls_u32: Fix reference counter leak leading to overflow (Davide Caratti) [2225486] {CVE-2023-3609}
+- NFSv4.1: fix handling of backchannel binding in BIND_CONN_TO_SESSION (Benjamin Coddington) [2219604]
+
+* Fri Sep 01 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.101.1.el7]
+- cifs: fix a buffer leak in smb2_query_symlink (Jay Shin) [2166706]
+- kernfs: Improve kernfs_notify() poll notification latency (Ian Kent) [1703180]
+- netfilter: nf_tables: prevent OOB access in nft_byteorder_eval (Florian Westphal) [2221720] {CVE-2023-35001}
+
+* Wed Aug 23 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.100.1.el7]
+- bnxt: count Tx drops (Jamie Bainbridge) [2175062]
+- bnxt: make sure xmit_more + errors does not miss doorbells (Jamie Bainbridge) [2175062]
+- netfilter: nf_tables: skip deactivated anonymous sets during lookups (Florian Westphal) [2196159] {CVE-2023-32233}
+- netfilter: nf_tables: do not allow SET_ID to refer to another table (Florian Westphal) [2196159]
+
+* Thu Aug 10 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.99.1.el7]
+- x86/cpu/amd: Add a Zenbleed fix (Waiman Long) [2226841] {CVE-2023-20593}
+- x86/cpu/amd: Move the errata checking functionality up (Waiman Long) [2226841] {CVE-2023-20593}
+- x86/cpu: Restore AMD's DE_CFG MSR after resume (Waiman Long) [2226841] {CVE-2023-20593}
+
+* Thu Aug 03 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.98.1.el7]
+- GFS2: gfs2_dir_get_hash_table(): avoiding deferred vfree() is easy here... (Andrew Price) [2190450]
+- GFS2: use kvfree() instead of open-coding it (Andrew Price) [2190450]
+
+* Mon Jul 24 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.97.1.el7]
+- net/sched: flower: fix possible OOB write in fl_set_geneve_opt() (Davide Caratti) [2216982] {CVE-2023-35788}
+- netfilter: conntrack: re-fetch conntrack after insertion (Florian Westphal) [2188190]
+- netfilter: conntrack: handle tcp challenge acks during connection reuse (Florian Westphal) [2128262]
+- netfilter: conntrack: reduce timeout when receiving out-of-window fin or rst (Florian Westphal) [2128262]
+- netfilter: conntrack: remove unneeded indent level (Florian Westphal) [2128262]
+- netfilter: conntrack: ignore overly delayed tcp packets (Florian Westphal) [2128262]
+- netfilter: conntrack: prepare tcp_in_window for ternary return value (Florian Westphal) [2128262]
+- netfilter: conntrack: connection timeout after re-register (Florian Westphal) [2128262]
+- netfilter: conntrack: always store window size un-scaled (Florian Westphal) [2128262]
+- netfilter: conntrack: work around exceeded receive window (Florian Westphal) [2128262]
+- netfilter: conntrack: avoid misleading 'invalid' in log message (Florian Westphal) [2128262]
+- netfilter: remove BUG_ON() after skb_header_pointer() (Florian Westphal) [2128262]
+- netfilter: nf_conntrack_tcp: re-init for syn packets only (Florian Westphal) [2128262]
+- netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options (Florian Westphal) [2128262]
+- netfilter: conntrack: re-init state for retransmitted syn-ack (Florian Westphal) [2128262]
+- netfilter: conntrack: move synack init code to helper (Florian Westphal) [2128262]
+- netfilter: conntrack: do not renew entry stuck in tcp SYN_SENT state (Florian Westphal) [2128262]
+- netfilter: nf_conntrack_tcp: Fix stack out of bounds when parsing TCP options (Florian Westphal) [2128262]
+
+* Fri Jul 07 2023 Jan Stancek <jstancek@redhat.com> [3.10.0-1160.96.1.el7]
+- sched/fair: Eliminate bandwidth race between throttling and distribution (Phil Auld) [2180681]
+- sched/fair: Fix race between runtime distribution and assignment (Phil Auld) [2180681]
+- sched/fair: Don't assign runtime for throttled cfs_rq (Phil Auld) [2180681]
+
* Fri Jun 23 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.95.1.el7]
- perf/s390x: Align the register list to what we support (Michael Petlan) [2207745]
- Revert "[tools] s390/perf: add perf register support for floating-point registers" (Michael Petlan) [2207745]
