diff --git a/sys-kernel/hardened-kernel/Manifest b/sys-kernel/hardened-kernel/Manifest index ada4b80..7361a50 100644 --- a/sys-kernel/hardened-kernel/Manifest +++ b/sys-kernel/hardened-kernel/Manifest @@ -1,12 +1,13 @@ AUX linux-5.10.amd64.config 151805 BLAKE2B 10c26869b8aa0ce9bca9ec4274255c02c9a904d776dc7443a96b011fbe022e86bfc49ffc9cde7314dde5d0f638588b69cdac3b6b74a036b358d195b63bbebe82 SHA512 6c53abad919795c633ee1ce8016fd5e1e2d9d16d809652738a6eacf44d7bf024b85666b1dd4e88ea6dbd1bdbe77f4fc8d1411131ce39c852bd451388ca1870ff +AUX linux-5.10/beacon_timeout.patch 4047 BLAKE2B b182c326d5d750bec5f73b263124323f10fd452c839d540f21caa7fff46ffa0acb90433bece36efc29056362090cc2512ad116c135402056db557b601e41ab26 SHA512 3dd7e7b83b451ccfbb6285ea04ebcc11f6f1b08c6c676baba7942aa87f62e7118d4e4ad23fa4ddecf61968af5904084a7091712b6a67044b238f2a3f24a4701b DIST genpatches-4.19-124.base.tar.xz 3482680 BLAKE2B e8716be023f6512fb4613fab11a6ecf6472dd738cdb63669cfc6573e70030bfc5d3374c18672661867dd584d621cffdced21403a337af40b2428ff6703b6aa53 SHA512 dde38efe4b8e413b0aa1380c3fc4284b153b048a38cb8e05fdec34c14588d3e60092a20d247195389ceace0dc9e353caacaf9573c75a2327b4667dcad90c15fa DIST genpatches-4.19-124.extras.tar.xz 17516 BLAKE2B 1c7db2f9f888a9becf0dd891a3f9980431419af50552a4cda06c51f1a7b5d923698d6ce625c619b73386a300438f858a551ca53adc2a5bc110d6eda2a575a22d SHA512 4f29e993be982e272205c6d57e1828e7cc837abbde4a1e7b59e6b20eac648315bec135338b8f6e33df2b49d81e855a9f5c7eeebf6238fa8bc3bbd2215c324eff -DIST genpatches-5.10-53.base.tar.xz 1650792 BLAKE2B f4e4f7c7e49b78db706c2e5e47c1e0a3e99576316150f4c2443cca5885e18969181fc94febd3814de4fe9256b1324446be160b3d9992edd0375ff12496c501f0 SHA512 533a45b4fb2bbf531fcc8eb38928593a21af77144ea510e13d0d1d84919425a26371b9e1b5052fe6e7c1551683a5f88e1fd24512d9d2142fa8437f69de1c47ba -DIST genpatches-5.10-53.extras.tar.xz 3420 BLAKE2B 3079e8f65de0ae8d927cce28fdaf97b902d5cbe3f419c9247a76d27bad296f5f002773ad176dbd086ed04d5346da86db91f1c2bc87247e14a86e0790cc2b1ebb SHA512 0402a07c174f9ab289654e0ff15647d53e5624fc729b73f7028f6c1619285914c5a672b42bd9029fc4f1f773631f86d51e6b48a5c96f84825761b42b76ea18f9 +DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06 +DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-hardened-4.19.125.a.patch 97705 BLAKE2B ca013aaf31bf90177b5d2d2cb2018bafaa0173c6017193bd5bbc3568a4bd34d628798a8dc56411add627340b3b1617f7d43b02a7e032bd7e4374166e7c3bf8e0 SHA512 771a696115a9879b36fb01d3dc7c4cc9cd02591c07f6cca6f73e956818fa77e1dc42289f79167c4fb2deb69ec8fd9b458757bf45403d7fce874b7b57eb551482 -DIST linux-hardened-5.10.48-hardened1.patch 118942 BLAKE2B d6870f34c78d89c4c86df47393069a918e22fce8d0b82bd3ed89c2b98b26f333177532a47af954fdfc9f8acdb1262ca44300161d42f1369f3dc7346162c8fc8f SHA512 6fba1d7663b13a68d518a1e2824b22c0986fedbf09328008f63d506d29ef68f945ab35fb607fc3a44780f2fb82f413c0dd279dd5983e3c3a8cf518cd5ba7497a +DIST linux-hardened-5.10.52-hardened1.patch 118920 BLAKE2B d62736ac92b20e3360dbe1d32384ec2643573b55bc3eecd97c787e9d8723bac875037c01f378862ed0f1bebeaaadd2c7802007f59ad27a9c49917e64710cd120 SHA512 cabbf2d125d0c4c41cc89421e10929956fbcd164b2ba69ad01e5737433b606733dacdd9efee439d25cb46c85d46f6e363a8ff8131557fa82d2cbf042eb6924b0 EBUILD hardened-kernel-4.19.125.ebuild 2568 BLAKE2B 1c165f8359a5d5926cc866769f0ca7fe8b999e190cc92cd92b253efac18ca6d4bcddb89c1ffe8d83bdcb2249421dd58b7372ec4d74f4f432e874503a8fe2e5ab SHA512 08c7c6ef75a00bbf78ab49a01214230e44a602c51b70ad9d61b49c76a014b6d006d67984a482b3142b9aba835ab819f80bbde0a8adc40eab298fba9e9d3b3742 -EBUILD hardened-kernel-5.10.48.ebuild 3016 BLAKE2B 469515e9021326c16a71f1fbf90d4df8c06683b4331671519610822c3f26ed231b2a3684a4dad0b0ff2f7062fa8529743b8a0cc6cf6807d0aae603f08b3299ec SHA512 2a9a4fb7336ee6a1659a3d7a4e5bd6ac88fa1198b59ec083fe664b073664affdf69b3aaa7a5e2c69f4e9ee1c07478dcb3c13b433e5e0dbb9f450a18c8312bc21 +EBUILD hardened-kernel-5.10.52.ebuild 3016 BLAKE2B 737c1e4ba35cbfb13778169cb092643c701686bbbb53e2442ff77b6b6540e27b7bff1abe7da4a14057fc75c734a25c50375ed8ce05a6a54116a1f3b1a9bb2185 SHA512 50814ca60199a2d8c416d998c6e2a9e0ede68279b7e771151459fa208021c314f6c298b31e2e8369c1f84b60f17280833e284da71e3a034d4f2385bb1c1ae30b MISC metadata.xml 345 BLAKE2B 4003222d76459210cbeba27d68bcef9b42f500dd3dafe53505dae42004c5224eeae395fb30d7582de614654d2fde19d118c8c31fbc35e5335c9150d93f42efc9 SHA512 994d288cd16858bad3177d383a279f0f549ddf40ef87c62683815540b331bd48d4afa4d0c6af947e409c58f8abb5e1da045bb98dc00a422ea724cdf0610d6619 diff --git a/sys-kernel/hardened-kernel/files/linux-5.10/beacon_timeout.patch b/sys-kernel/hardened-kernel/files/linux-5.10/beacon_timeout.patch new file mode 100644 index 0000000..ddc0087 --- /dev/null +++ b/sys-kernel/hardened-kernel/files/linux-5.10/beacon_timeout.patch @@ -0,0 +1,95 @@ +From ad3187dfd4f741e291a1ca0d3ce5b714eacbd279 Mon Sep 17 00:00:00 2001 +From: Zachary Michaels +Date: Thu, 7 Jan 2021 08:13:11 -0800 +Subject: [PATCH] iwlwifi: Make missed beacon timeout configurable + +Makes the beacon timeout a module parameter, allowing the original default (16 +missed beacons) to be kept while also enabling users that experience problems to +increase the timeout. + +See https://bugzilla.kernel.org/show_bug.cgi?id=203709 +--- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++++ + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 - + 4 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +index 9dcd2e990c9c..ec01f922b2e7 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -1732,6 +1732,7 @@ struct iwl_mod_params iwlwifi_mod_params = { + .power_level = IWL_POWER_INDEX_1, + .uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT, + .enable_ini = true, ++ .beacon_timeout = 16, + /* the rest are 0 by default */ + }; + IWL_EXPORT_SYMBOL(iwlwifi_mod_params); +@@ -1849,6 +1850,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, + bool, S_IRUGO | S_IWUSR); + MODULE_PARM_DESC(enable_ini, + "Enable debug INI TLV FW debug infrastructure (default: true"); ++module_param_named(beacon_timeout, iwlwifi_mod_params.beacon_timeout, uint, 0644); ++MODULE_PARM_DESC(beacon_timeout, ++ "Number of missed beacons before disconnecting (default: 16)"); + + /* + * set bt_coex_active to true, uCode will do kill/defer +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +index e8ce3a300857..801d12a27354 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +@@ -115,6 +115,7 @@ enum iwl_uapsd_disable { + * @disable_11ac: disable VHT capabilities, default = false. + * @remove_when_gone: remove an inaccessible device from the PCIe bus. + * @enable_ini: enable new FW debug infratructure (INI TLVs) ++ * @beacon_timeout: number of missed beacons before disconnect, default = 16 + */ + struct iwl_mod_params { + int swcrypto; +@@ -137,6 +138,7 @@ struct iwl_mod_params { + bool disable_11ax; + bool remove_when_gone; + bool enable_ini; ++ u32 beacon_timeout; + }; + + static inline bool iwl_enable_rx_ampdu(void) +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +index cbdebefb854a..07fc82398373 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +@@ -63,6 +63,7 @@ + #include + #include + #include "iwl-io.h" ++#include "iwl-modparams.h" + #include "iwl-prph.h" + #include "fw-api.h" + #include "mvm.h" +@@ -1428,7 +1429,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm, + * TODO: the threshold should be adjusted based on latency conditions, + * and/or in case of a CS flow on one of the other AP vifs. + */ +- if (rx_missed_bcon > IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG) ++ if (rx_missed_bcon > iwlwifi_mod_params.beacon_timeout) + iwl_mvm_connection_loss(mvm, vif, "missed beacons"); + else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD) + ieee80211_beacon_loss(vif); +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +index 7159d1da3e77..ce960d7d6a00 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +@@ -92,7 +92,6 @@ + /* RSSI offset for WkP */ + #define IWL_RSSI_OFFSET 50 + #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8 +-#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16 + + /* A TimeUnit is 1024 microsecond */ + #define MSEC_TO_TU(_msec) (_msec*1000/1024) +-- +2.29.2 + diff --git a/sys-kernel/hardened-kernel/hardened-kernel-5.10.48.ebuild b/sys-kernel/hardened-kernel/hardened-kernel-5.10.52.ebuild similarity index 98% rename from sys-kernel/hardened-kernel/hardened-kernel-5.10.48.ebuild rename to sys-kernel/hardened-kernel/hardened-kernel-5.10.52.ebuild index 73dae59..c855b5a 100644 --- a/sys-kernel/hardened-kernel/hardened-kernel-5.10.48.ebuild +++ b/sys-kernel/hardened-kernel/hardened-kernel-5.10.52.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit kernel-build MY_P=linux-${PV%.*} -GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.}+5)) +GENPATCHES_P=genpatches-${PV%.*}-$((${PV##*.}+6)) HARDENED_PATCH_VER="${PV}-hardened1" GENPATCHES_EXCLUDE="1500_XATTR_USER_PREFIX.patch 1510_fs-enable-link-security-restrictions-by-default.patch