Updated to 5.10.14

3 files changed, 11 insertions, 65 deletions

diff --git a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch
deleted file mode 100644
index 594302d..0000000
--- a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 545d6504ef3c786b8294ca2129111227a7bb6515 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Mon, 25 Jan 2021 07:09:49 -0800
-Subject: iwlwifi: provide gso_type to GSO packets
-
-commit 81a86e1bd8e7060ebba1718b284d54f1238e9bf9 upstream.
-
-net/core/tso.c got recent support for USO, and this broke iwlfifi
-because the driver implemented a limited form of GSO.
-
-Providing ->gso_type allows for skb_is_gso_tcp() to provide
-a correct result.
-
-Fixes: 3d5b459ba0e3 ("net: tso: add UDP segmentation support")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Ben Greear <greearb@candelatech.com>
-Tested-by: Ben Greear <greearb@candelatech.com>
-Cc: Luca Coelho <luciano.coelho@intel.com>
-Cc: Johannes Berg <johannes@sipsolutions.net>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=209913
-Link: https://lore.kernel.org/r/20210125150949.619309-1-eric.dumazet@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Cc: Robert Hancock <hancockrwd@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-index fe1c538cd718..7626117c01fa 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,
- 
- 	next = skb_gso_segment(skb, netdev_flags);
- 	skb_shinfo(skb)->gso_size = mss;
-+	skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;
- 	if (WARN_ON_ONCE(IS_ERR(next)))
- 		return -EINVAL;
- 	else if (next)
-@@ -855,6 +856,8 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,
- 
- 		if (tcp_payload_len > mss) {
- 			skb_shinfo(tmp)->gso_size = mss;
-+			skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 :
-+							   SKB_GSO_TCPV6;
- 		} else {
- 			if (qos) {
- 				u8 *qc;
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/PKGBUILD b/PKGBUILD
index 9cbb750..58a9e3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
 _majver=10
-_minver=12
+_minver=14
 _gccpatchver='20201113'
 _gccpatchger='10.1'
 _gccpatchker='5.8'
@@ -50,7 +50,6 @@ source=(
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}-${_hardenedver}/${_pkgbase}-${pkgver}-${_hardenedver}.patch{,.sig}
   config         # the main kernel config file
   0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
-  0003-iwlwifi-provide-gso_type-to-GSO-packets.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
   raid6-default-algo.patch
@@ -64,15 +63,14 @@ validpgpkeys=(
 )
 b2sums=('86103699a6bc906e85429430df098b0ddb7cfc8c887f98b37f994498388d634554e119eadb1b15f591bdf4f463e7efb7420e3e370af0029b7ed9e988a5f26b01'
         'SKIP'
-        '448453ffc065a067fc2132b0c83eae2b878f4e77d2924e0b94b2952473dd540c8aff46bb9cf491e641b57738e2bf29545d8d7f0a41e17bef935a1b4d0900861e'
+        '2d92333ef0fd3c2fb9daac1bac22025c2aae0af31fe79088d20601e03e0376cde6a148da5561635873a870b57ea50fb5f451ba3acf456d189e7d2d683fc50fb1'
         'SKIP'
-        '9031b6d007f609e2452b895f8ca545573c5d2c07e1dc228cdef458a45b9713acd2de837d0a3a39bf9ae8ae33624a3e8dacf605620311a44a590f19dcb5ea0cad'
+        '418ed5f89f9fcbf622b7de04df1768bfe6e12cb00bac89054c8288b5fca8effdb853066a6a73e2bf0be03970d5d73a9bbfb03138086da21594d68bd3e2d8edba'
         'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00'
-        '9b973fa8d55d9d68020f8d05458edfad2eea916ad0bbefcabf3e41a750aae8d9bb1c1c3820105bb785e050dd7a4343ab55c8bd97ab657520c17d2da3c18b7a99'
         '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
-        '0f4f3c9954cedf9c7b8cf6efa536e14254b008d0ed32a5332be4cbc1c2ce09ce2b5161467ae2fa872021e668a3c3d9b9f1f3d46f83331fdc5d9560e99dd43451'
+        'c34aecdf60db8c7ec2b457390d146c2328797f75a788f29f649e401aeace4e8ae7ec94953649ce5dff1a1003e9f380ce39fc6821544b21977016e14a42fa1dcc'
         'SKIP')
 
 export KBUILD_BUILD_HOST=arc4linux
@@ -95,7 +93,6 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch
-  patch -p1 -i ../0003-iwlwifi-provide-gso_type-to-GSO-packets.patch
 
 
   # linux hardened patch
diff --git a/config b/config
index 0abcabc..4a79192 100644
--- a/config
+++ b/config
@@ -2919,7 +2919,7 @@ CONFIG_B53_SRAB_DRIVER=m
 CONFIG_B53_SERDES=m
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
-CONFIG_NET_DSA_LANTIQ_GSWIP=m
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 CONFIG_NET_DSA_MT7530=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
@@ -3314,7 +3314,7 @@ CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
-CONFIG_ROCKCHIP_PHY=m
+# CONFIG_ROCKCHIP_PHY is not set
 CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
@@ -4153,7 +4153,7 @@ CONFIG_SERIAL_UARTLITE_NR_UARTS=1
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_LANTIQ=m
+# CONFIG_SERIAL_LANTIQ is not set
 CONFIG_SERIAL_SCCNXP=m
 CONFIG_SERIAL_SC16IS7XX_CORE=m
 CONFIG_SERIAL_SC16IS7XX=m
@@ -4393,11 +4393,11 @@ CONFIG_SPI_DLN2=m
 CONFIG_SPI_NXP_FLEXSPI=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_LANTIQ_SSC=m
+# CONFIG_SPI_LANTIQ_SSC is not set
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
-CONFIG_SPI_ROCKCHIP=m
+# CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
 CONFIG_SPI_MXIC=m
@@ -9356,7 +9356,8 @@ CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 # CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_LOADPIN=y
+CONFIG_SECURITY_LOADPIN_ENFORCE=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set