Update to 5.15.89-1

4 files changed, 13 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c22a150f3512..cbc8c000fc5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-vfio-lts
 	pkgdesc = LTS Linux VFIO
-	pkgver = 5.15.88
+	pkgver = 5.15.89
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -19,28 +19,26 @@ pkgbase = linux-vfio-lts
 	makedepends = imagemagick
 	makedepends = texlive-latexextra
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.88.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.88.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.89.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.89.tar.sign
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
 	source = 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
 	source = 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
 	source = 0005-lg-laptop-Recognize-more-models.patch
-	source = 0006-netfilter-nft_payload-incorrect-arithmetics-when-fetching-vlan-header-bits.patch
 	source = add-acs-overrides.patch
 	source = i915-vga-arbiter.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 417539fdd96a3af97ef9ad2b51ca13967cb922f53970563b60290b935a81a181
+	sha256sums = e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8
 	sha256sums = SKIP
-	sha256sums = 63e560fe9eff69f07336334a38f22eef8a798ccf6c7a4a90285ea94c70d5fbb4
+	sha256sums = e4327d26fc51b2cd304fc40695ba5433974a4545c8b12adf227a826f0b7008e2
 	sha256sums = 7bd64ff894475b3415d792ba8466ba7e8f872af56dbf1aeed0d261fe4008b8b5
 	sha256sums = 39649dc1dfcb06b411ad124e123769e955a78961b4ea17538c0919a930925549
 	sha256sums = 56c12551e859cc67520909e64feecbf1b190cee8addef150c5b9d1bb1d40981e
 	sha256sums = 5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde
 	sha256sums = 067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9
-	sha256sums = e1ba639a62ef788cb5653cbf5601b1534379211c50176e48f0b04ae555941c8d
 	sha256sums = b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77
 	sha256sums = 856230cfbdc2bb53a4920dfbcb6fb2d58427b7b184e5f94e21f08011d0a2fcc6
 
diff --git a/0006-netfilter-nft_payload-incorrect-arithmetics-when-fetching-vlan-header-bits.patch b/0006-netfilter-nft_payload-incorrect-arithmetics-when-fetching-vlan-header-bits.patch
deleted file mode 100644
index ef401a9f86f0..000000000000
--- a/0006-netfilter-nft_payload-incorrect-arithmetics-when-fetching-vlan-header-bits.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 696e1a48b1a1b01edad542a1ef293665864a4dd0 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Wed, 11 Jan 2023 17:07:33 +0100
-Subject: netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits
-
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-
-commit 696e1a48b1a1b01edad542a1ef293665864a4dd0 upstream.
-
-If the offset + length goes over the ethernet + vlan header, then the
-length is adjusted to copy the bytes that are within the boundaries of
-the vlan_ethhdr scratchpad area. The remaining bytes beyond ethernet +
-vlan header are copied directly from the skbuff data area.
-
-Fix incorrect arithmetic operator: subtract, not add, the size of the
-vlan header in case of double-tagged packets to adjust the length
-accordingly to address CVE-2023-0179.
-
-Reported-by: Davide Ornaghi <d.ornaghi97@gmail.com>
-Fixes: f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/netfilter/nft_payload.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/netfilter/nft_payload.c
-+++ b/net/netfilter/nft_payload.c
-@@ -63,7 +63,7 @@ nft_payload_copy_vlan(u32 *d, const stru
- 			return false;
- 
- 		if (offset + len > VLAN_ETH_HLEN + vlan_hlen)
--			ethlen -= offset + len - VLAN_ETH_HLEN + vlan_hlen;
-+			ethlen -= offset + len - VLAN_ETH_HLEN - vlan_hlen;
- 
- 		memcpy(dst_u8, vlanh + offset - vlan_hlen, ethlen);
- 
diff --git a/PKGBUILD b/PKGBUILD
index 0f2c14a99255..3a1ca550a82d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=linux-vfio-lts
-pkgver=5.15.88
+pkgver=5.15.89
 pkgrel=1
 pkgdesc='LTS Linux VFIO'
 url="https://www.kernel.org/"
@@ -21,7 +21,6 @@ source=(
   0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
   0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
   0005-lg-laptop-Recognize-more-models.patch
-  0006-netfilter-nft_payload-incorrect-arithmetics-when-fetching-vlan-header-bits.patch
   add-acs-overrides.patch
   i915-vga-arbiter.patch
 )
@@ -30,15 +29,14 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('417539fdd96a3af97ef9ad2b51ca13967cb922f53970563b60290b935a81a181'
+sha256sums=('e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8'
             'SKIP'
-            '63e560fe9eff69f07336334a38f22eef8a798ccf6c7a4a90285ea94c70d5fbb4'
+            'e4327d26fc51b2cd304fc40695ba5433974a4545c8b12adf227a826f0b7008e2'
             '7bd64ff894475b3415d792ba8466ba7e8f872af56dbf1aeed0d261fe4008b8b5'
             '39649dc1dfcb06b411ad124e123769e955a78961b4ea17538c0919a930925549'
             '56c12551e859cc67520909e64feecbf1b190cee8addef150c5b9d1bb1d40981e'
             '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde'
             '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9'
-            'e1ba639a62ef788cb5653cbf5601b1534379211c50176e48f0b04ae555941c8d'
             'b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77'
             '856230cfbdc2bb53a4920dfbcb6fb2d58427b7b184e5f94e21f08011d0a2fcc6')
 
diff --git a/config b/config
index 7c3fc92ebabe..0fd9afe95f1f 100644
--- a/config
+++ b/config
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.88 Kernel Configuration
+# Linux/x86 5.15.89 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y