Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-21 14:21:02 +02:00
Code Issues Projects Releases Wiki Activity

pentoo-sources: 5.15.12->5.15.13, cleanup old

Browse source
This commit is contained in:
Rick Farina (Zero_Chaos) 2022-01-05 13:48:13 -05:00
parent 8a8ecb90d6
commit 4518665fed
No known key found for this signature in database
GPG key ID: A29433C0AA431DDC
24 changed files with 2 additions and 84923 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys-kernel/pentoo-sources/Manifest
View file

@ -1,12 +1,4 @@
DIST genpatches-5.10-85.base.tar.xz 2458980 BLAKE2B 56a0fe583f9db1bd5d1a051c584d1eedd1ac5fe756aea67b51aaaea798ab10669ed2213f0141e1cfb9ef47b7200e35f266c755dcc164121f5d8e7578a31b7935 SHA512 c213cecaa7f30b2beb000073520e3b2dbdc3f106c01cdf166a77af6d795b9ff77f1a05e0fcb0d3d0855fd46d54a1ca0f2d90d8f6dcd4c763050ab34462199c59
DIST genpatches-5.10-85.experimental.tar.xz 16868 BLAKE2B 4e0beabb6fc52c0efe19b8a259f384a53dbf2f41538b4f229b3edd9ada23b6306d17faf42286aa532491397f168b8fb6e980d8154f70cf28d054044532ac8def SHA512 93ec464ec92e2d81f7b9025147368fba3f4307f7b426a573b6dfa49b1d9cf4419cff85de8d5384b85f682e79c357f70fee58a23085bbff9ba4c476b950d24452
DIST genpatches-5.10-85.extras.tar.xz 3840 BLAKE2B 42ce8a5ec14ebdb8067853fc388b30e178e705e53d6ca547e21ab76bf94ddad1368000226ab455116758cb6ce01e8a8624332dd217b2d49d6ab3393d6f740966 SHA512 10bb7747d4d23203c39cc0f15abc70e5dbe8f3e390b2c95338982225634b3008e415c372b81029b85e0f6619112c65327e6acac5de0fa3cdf58bd8ac30607803
DIST genpatches-5.14-17.base.tar.xz 622212 BLAKE2B a0c5bcabe08e292287b57cdbdd573c8b61cedfc0560a63958ccafe2c1cd671b057b3faf6c4a577e9063b6eae46a1c6d7fb7e25ee92406e4a597ec0e74bb241d3 SHA512 3042091a962cd540b504570ab5ec11b3dda25b84c03529e78a01db232b4a0a716b9ee7b60352b7ad5afca7534af6ccdf14bcad9140ebd78ed56f292e47bf103f
DIST genpatches-5.14-17.experimental.tar.xz 78572 BLAKE2B f8e25d02904e76757fa94f754f49e89077449cb7578f6e2eaf10e26992f56835fbcd96f793a9356b17fb173fde29fa53af88294deac36ee250291b119516b8c7 SHA512 bd24f3b6e4dd75f9de6b6c069b7236d508217ae7a377faba29c00e895c428249fa84913206ec5bc4ff82eeb91970632fe3625e196a79136549191fd428a24c3d
DIST genpatches-5.14-17.extras.tar.xz 3844 BLAKE2B f50d2d3e47b0e0387c68eff502be6163a167436f6e99a59a56420c1f4215cee35a892b95bcfb2b2f73261db57b52675f080e90a3f69512ba00163bef95cd8e94 SHA512 eaed5b496a124c94093d85cc23d73b345b9bc6b946656fa9e8f3d7eeff719303841f199d9d1312b4d8b69e7f55883a3c8961d3cd568c5ac48390850511c936ad
DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3dbdbeaa9898410d0ffef103158e3856b18dfebba293aba62e4adfcb0c402d803428637c7a7c7b78a6483b64ab816f3fe355 SHA512 37f506d21264ac54d3075890fdb5f6267039518f083961f13a1859e1c20a390be12071a95091d9b01f5aaff11623569f0bc663180e4b6741b765e64ff45af361
DIST genpatches-5.15-14.experimental.tar.xz 69376 BLAKE2B 16da6f6da679a6d4aeb7906e8721420d8d7a39f54ad10c1e72611c4bb0a1be0c001c32fffdb02d12b865a9c430dcbd48bb257e8f3d191d1f7bc150e0643eecbc SHA512 e9bae0b9e435d26f759ae0ed39f62d33ba619a3027543e9d5fa1c0f2d41372a09beb1affb07e11e29d926ecbcfa3bcccb9f5e78f98790d927250c2351e563ee0
DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a

70
sys-kernel/pentoo-sources/files/4001_cfg80211_remove_maxchannels.patch
View file

@ -1,70 +0,0 @@
From d1d61db1d31cd5ef5c0420dad3e922c441cd89bc Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 6 May 2021 22:10:38 +0200
Subject: [PATCH] cfg80211: remove CFG80211_MAX_NUM_DIFFERENT_CHANNELS
We no longer need to put any limits here, hardware will and
mac80211-hwsim can do whatever it likes. The reason we had
this was some accounting code (still mentioned in the comment)
but that code was deleted in commit c781944b71f8 ("cfg80211:
Remove unused cfg80211_can_use_iftype_chan()").
Change-Id: Iac4da68d54b9f1fdc18a03586bbe06aeb9515425
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
drivers/net/wireless/mac80211_hwsim.c | 5 -----
include/net/cfg80211.h | 2 --
net/wireless/core.c | 8 --------
3 files changed, 15 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index fa7d4c20dc13..8fe42114d8d6 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3791,11 +3791,6 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
return -EINVAL;
}
- if (param.channels > CFG80211_MAX_NUM_DIFFERENT_CHANNELS) {
- GENL_SET_ERR_MSG(info, "too many channels specified");
- return -EINVAL;
- }
-
if (info->attrs[HWSIM_ATTR_NO_VIF])
param.no_vif = true;
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 394c4269901c..473d291b9017 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1244,8 +1244,6 @@ struct cfg80211_csa_settings {
u8 count;
};
-#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
-
/**
* struct iface_combination_params - input parameters for interface combinations
*
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a2785379df6e..04b8fbae3943 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -576,14 +576,6 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
if (WARN_ON(!c->num_different_channels))
return -EINVAL;
- /*
- * Put a sane limit on maximum number of different
- * channels to simplify channel accounting code.
- */
- if (WARN_ON(c->num_different_channels >
- CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
- return -EINVAL;
-
/* DFS only works on one channel. */
if (WARN_ON(c->radar_detect_widths &&
(c->num_different_channels > 1)))
--
2.30.2

17
sys-kernel/pentoo-sources/files/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch
View file

@ -1,17 +0,0 @@
tx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b47435d..751934b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -539,7 +539,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
if (tx->sta)
tx->sta->last_tx_rate = txrc.reported_rate;
- if (unlikely(!info->control.rates[0].count))
+ if (unlikely(!info->control.rates[0].count) ||
+ info->flags & IEEE80211_TX_CTL_NO_ACK)
info->control.rates[0].count = 1;
if (is_multicast_ether_addr(hdr->addr1)) {

12
sys-kernel/pentoo-sources/files/4006_mac80211_fix_radiotap_header_generation.patch
View file

@ -1,12 +0,0 @@
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index fc5c608d02e2..3562730ea0f8 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -364,7 +364,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
* the compiler to think we have walked past the end of the
* struct member.
*/
- pos = (void *)&rthdr->it_optional[it_present - rthdr->it_optional];
+ pos = (void *)&rthdr->it_optional[it_present + 1 - rthdr->it_optional];
/* the order of the following fields is important */

4844
sys-kernel/pentoo-sources/files/4008_cfg-netdev-rtnl-lock-unified.patch
View file

File diff suppressed because it is too large Load diff

4242
sys-kernel/pentoo-sources/files/4008_cfg80211-change-netdev-rtnl-lock.patch
View file

File diff suppressed because it is too large Load diff

586
sys-kernel/pentoo-sources/files/4009_iwl_fix_parallel_locking-exp.patch
View file

@ -1,586 +0,0 @@
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index d313c9befa23..259378d6ed0d 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -2219,6 +2219,8 @@ int cfg80211_wext_siwscan(struct net_device *dev,
eth_broadcast_addr(creq->bssid);
+ mutex_lock(&rdev->mtx);
+
rdev->scan_req = creq;
err = rdev_scan(rdev, creq);
if (err) {
@@ -2230,6 +2232,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
creq = NULL;
dev_hold(dev);
}
+ mutex_unlock(&rdev->mtx);
out:
kfree(creq);
return err;
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 7b6529d81c61..cb08139397dd 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -257,17 +257,23 @@ int cfg80211_wext_siwrts(struct net_device *dev,
u32 orts = wdev->wiphy->rts_threshold;
int err;
- if (rts->disabled || !rts->fixed)
+ mutex_lock(&rdev->mtx);
+ if (rts->disabled || !rts->fixed) {
wdev->wiphy->rts_threshold = (u32) -1;
- else if (rts->value < 0)
- return -EINVAL;
- else
+ } else if (rts->value < 0) {
+ err = -EINVAL;
+ goto out;
+ } else {
wdev->wiphy->rts_threshold = rts->value;
+ }
err = rdev_set_wiphy_params(rdev, WIPHY_PARAM_RTS_THRESHOLD);
+
if (err)
wdev->wiphy->rts_threshold = orts;
+out:
+ mutex_unlock(&rdev->mtx);
return err;
}
EXPORT_WEXT_HANDLER(cfg80211_wext_siwrts);
@@ -295,11 +301,13 @@ int cfg80211_wext_siwfrag(struct net_device *dev,
u32 ofrag = wdev->wiphy->frag_threshold;
int err;
- if (frag->disabled || !frag->fixed)
+ mutex_lock(&rdev->mtx);
+ if (frag->disabled || !frag->fixed) {
wdev->wiphy->frag_threshold = (u32) -1;
- else if (frag->value < 256)
- return -EINVAL;
- else {
+ } else if (frag->value < 256) {
+ err = -EINVAL;
+ goto out;
+ } else {
/* Fragment length must be even, so strip LSB. */
wdev->wiphy->frag_threshold = frag->value & ~0x1;
}
@@ -307,6 +315,8 @@ int cfg80211_wext_siwfrag(struct net_device *dev,
err = rdev_set_wiphy_params(rdev, WIPHY_PARAM_FRAG_THRESHOLD);
if (err)
wdev->wiphy->frag_threshold = ofrag;
+out:
+ mutex_unlock(&rdev->mtx);
return err;
}
@@ -341,6 +351,7 @@ static int cfg80211_wext_siwretry(struct net_device *dev,
(retry->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT)
return -EINVAL;
+ mutex_lock(&rdev->mtx);
if (retry->flags & IW_RETRY_LONG) {
wdev->wiphy->retry_long = retry->value;
changed |= WIPHY_PARAM_RETRY_LONG;
@@ -359,6 +370,7 @@ static int cfg80211_wext_siwretry(struct net_device *dev,
wdev->wiphy->retry_short = oshort;
wdev->wiphy->retry_long = olong;
}
+ mutex_unlock(&rdev->mtx);
return err;
}
@@ -581,15 +593,18 @@ static int cfg80211_wext_siwencode(struct net_device *dev,
!rdev->ops->set_default_key)
return -EOPNOTSUPP;
+ mutex_lock(&rdev->mtx);
idx = erq->flags & IW_ENCODE_INDEX;
if (idx == 0) {
idx = wdev->wext.default_key;
if (idx < 0)
idx = 0;
- } else if (idx < 1 || idx > 4)
- return -EINVAL;
- else
+ } else if (idx < 1 || idx > 4) {
+ err = -EINVAL;
+ goto out;
+ } else {
idx--;
+ }
if (erq->flags & IW_ENCODE_DISABLED)
remove = true;
@@ -603,22 +618,28 @@ static int cfg80211_wext_siwencode(struct net_device *dev,
if (!err)
wdev->wext.default_key = idx;
wdev_unlock(wdev);
- return err;
+ goto out;
}
memset(&params, 0, sizeof(params));
params.key = keybuf;
params.key_len = erq->length;
- if (erq->length == 5)
+ if (erq->length == 5) {
params.cipher = WLAN_CIPHER_SUITE_WEP40;
- else if (erq->length == 13)
+ } else if (erq->length == 13) {
params.cipher = WLAN_CIPHER_SUITE_WEP104;
- else if (!remove)
- return -EINVAL;
+ } else if (!remove) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ err = cfg80211_set_encryption(rdev, dev, false, NULL, remove,
+ wdev->wext.default_key == -1,
+ idx, &params);
+out:
+ mutex_unlock(&rdev->mtx);
- return cfg80211_set_encryption(rdev, dev, false, NULL, remove,
- wdev->wext.default_key == -1,
- idx, &params);
+ return err;
}
static int cfg80211_wext_siwencodeext(struct net_device *dev,
@@ -758,38 +779,61 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
struct cfg80211_chan_def chandef = {
.width = NL80211_CHAN_WIDTH_20_NOHT,
};
- int freq;
+ int freq, ret;
+
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_siwfreq(dev, info, wextfreq, extra);
+ ret = cfg80211_mgd_wext_siwfreq(dev, info, wextfreq, extra);
+ break;
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_siwfreq(dev, info, wextfreq, extra);
+ ret = cfg80211_ibss_wext_siwfreq(dev, info, wextfreq, extra);
+ break;
case NL80211_IFTYPE_MONITOR:
freq = cfg80211_wext_freq(wextfreq);
- if (freq < 0)
- return freq;
- if (freq == 0)
- return -EINVAL;
+ if (freq < 0) {
+ ret = freq;
+ break;
+ }
+ if (freq == 0) {
+ ret = -EINVAL;
+ break;
+ }
chandef.center_freq1 = freq;
chandef.chan = ieee80211_get_channel(&rdev->wiphy, freq);
- if (!chandef.chan)
- return -EINVAL;
- return cfg80211_set_monitor_channel(rdev, &chandef);
+ if (!chandef.chan) {
+ ret = -EINVAL;
+ break;
+ }
+ ret = cfg80211_set_monitor_channel(rdev, &chandef);
+ break;
case NL80211_IFTYPE_MESH_POINT:
freq = cfg80211_wext_freq(wextfreq);
- if (freq < 0)
- return freq;
- if (freq == 0)
- return -EINVAL;
+ if (freq < 0) {
+ ret = freq;
+ break;
+ }
+ if (freq == 0) {
+ ret = -EINVAL;
+ break;
+ }
chandef.center_freq1 = freq;
chandef.chan = ieee80211_get_channel(&rdev->wiphy, freq);
- if (!chandef.chan)
- return -EINVAL;
- return cfg80211_set_mesh_channel(rdev, wdev, &chandef);
+ if (!chandef.chan) {
+ ret = -EINVAL;
+ break;
+ }
+ ret = cfg80211_set_mesh_channel(rdev, wdev, &chandef);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_giwfreq(struct net_device *dev,
@@ -801,24 +845,35 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
struct cfg80211_chan_def chandef;
int ret;
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);
+ ret = cfg80211_mgd_wext_giwfreq(dev, info, freq, extra);
+ break;
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
+ ret = cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
+ break;
case NL80211_IFTYPE_MONITOR:
- if (!rdev->ops->get_channel)
- return -EINVAL;
+ if (!rdev->ops->get_channel) {
+ ret = -EINVAL;
+ break;
+ }
ret = rdev_get_channel(rdev, wdev, &chandef);
if (ret)
- return ret;
+ break;
freq->m = chandef.chan->center_freq;
freq->e = 6;
- return 0;
+ ret = 0;
+ break;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ break;
}
+
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_siwtxpower(struct net_device *dev,
@@ -829,6 +884,7 @@ static int cfg80211_wext_siwtxpower(struct net_device *dev,
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
enum nl80211_tx_power_setting type;
int dbm = 0;
+ int ret;
if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
return -EINVAL;
@@ -870,7 +926,11 @@ static int cfg80211_wext_siwtxpower(struct net_device *dev,
return 0;
}
- return rdev_set_tx_power(rdev, wdev, type, DBM_TO_MBM(dbm));
+ mutex_lock(&rdev->mtx);
+ ret = rdev_set_tx_power(rdev, wdev, type, DBM_TO_MBM(dbm));
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_giwtxpower(struct net_device *dev,
@@ -889,7 +949,9 @@ static int cfg80211_wext_giwtxpower(struct net_device *dev,
if (!rdev->ops->get_tx_power)
return -EOPNOTSUPP;
+ mutex_lock(&rdev->mtx);
err = rdev_get_tx_power(rdev, wdev, &val);
+ mutex_unlock(&rdev->mtx);
if (err)
return err;
@@ -1129,7 +1191,9 @@ static int cfg80211_wext_siwpower(struct net_device *dev,
timeout = wrq->value / 1000;
}
+ mutex_lock(&rdev->mtx);
err = rdev_set_power_mgmt(rdev, dev, ps, timeout);
+ mutex_unlock(&rdev->mtx);
if (err)
return err;
@@ -1171,7 +1235,9 @@ static int cfg80211_wds_wext_siwap(struct net_device *dev,
if (!rdev->ops->set_wds_peer)
return -EOPNOTSUPP;
+ mutex_lock(&rdev->mtx);
err = rdev_set_wds_peer(rdev, dev, (u8 *)&addr->sa_data);
+ mutex_unlock(&rdev->mtx);
if (err)
return err;
@@ -1204,7 +1270,7 @@ static int cfg80211_wext_siwrate(struct net_device *dev,
struct cfg80211_bitrate_mask mask;
u32 fixed, maxrate;
struct ieee80211_supported_band *sband;
- int band, ridx;
+ int band, ridx, ret;
bool match = false;
if (!rdev->ops->set_bitrate_mask)
@@ -1243,7 +1309,11 @@ static int cfg80211_wext_siwrate(struct net_device *dev,
if (!match)
return -EINVAL;
- return rdev_set_bitrate_mask(rdev, dev, NULL, &mask);
+ mutex_lock(&rdev->mtx);
+ ret = rdev_set_bitrate_mask(rdev, dev, NULL, &mask);
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_giwrate(struct net_device *dev,
@@ -1272,7 +1342,9 @@ static int cfg80211_wext_giwrate(struct net_device *dev,
if (err)
return err;
+ mutex_lock(&rdev->mtx);
err = rdev_get_station(rdev, dev, addr, &sinfo);
+ mutex_unlock(&rdev->mtx);
if (err)
return err;
@@ -1297,6 +1369,7 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
static struct iw_statistics wstats;
static struct station_info sinfo = {};
u8 bssid[ETH_ALEN];
+ int ret;
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION)
return NULL;
@@ -1315,7 +1388,11 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
memset(&sinfo, 0, sizeof(sinfo));
- if (rdev_get_station(rdev, dev, bssid, &sinfo))
+ mutex_lock(&rdev->mtx);
+ ret = rdev_get_station(rdev, dev, bssid, &sinfo);
+ mutex_unlock(&rdev->mtx);
+
+ if (ret)
return NULL;
memset(&wstats, 0, sizeof(wstats));
@@ -1366,17 +1443,27 @@ static int cfg80211_wext_siwap(struct net_device *dev,
struct sockaddr *ap_addr, char *extra)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
+ int ret;
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);
+ ret = cfg80211_ibss_wext_siwap(dev, info, ap_addr, extra);
+ break;
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);
+ ret = cfg80211_mgd_wext_siwap(dev, info, ap_addr, extra);
+ break;
case NL80211_IFTYPE_WDS:
- return cfg80211_wds_wext_siwap(dev, info, ap_addr, extra);
+ ret = cfg80211_wds_wext_siwap(dev, info, ap_addr, extra);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_giwap(struct net_device *dev,
@@ -1384,17 +1471,27 @@ static int cfg80211_wext_giwap(struct net_device *dev,
struct sockaddr *ap_addr, char *extra)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
+ int ret;
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);
+ ret = cfg80211_ibss_wext_giwap(dev, info, ap_addr, extra);
+ break;
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);
+ ret = cfg80211_mgd_wext_giwap(dev, info, ap_addr, extra);
+ break;
case NL80211_IFTYPE_WDS:
- return cfg80211_wds_wext_giwap(dev, info, ap_addr, extra);
+ ret = cfg80211_wds_wext_giwap(dev, info, ap_addr, extra);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_siwessid(struct net_device *dev,
@@ -1402,15 +1499,24 @@ static int cfg80211_wext_siwessid(struct net_device *dev,
struct iw_point *data, char *ssid)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
+ int ret;
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_siwessid(dev, info, data, ssid);
+ ret = cfg80211_ibss_wext_siwessid(dev, info, data, ssid);
+ break;
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_siwessid(dev, info, data, ssid);
+ ret = cfg80211_mgd_wext_siwessid(dev, info, data, ssid);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_giwessid(struct net_device *dev,
@@ -1418,18 +1524,27 @@ static int cfg80211_wext_giwessid(struct net_device *dev,
struct iw_point *data, char *ssid)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
+ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
+ int ret;
data->flags = 0;
data->length = 0;
+ mutex_lock(&rdev->mtx);
switch (wdev->iftype) {
case NL80211_IFTYPE_ADHOC:
- return cfg80211_ibss_wext_giwessid(dev, info, data, ssid);
+ ret = cfg80211_ibss_wext_giwessid(dev, info, data, ssid);
+ break;
case NL80211_IFTYPE_STATION:
- return cfg80211_mgd_wext_giwessid(dev, info, data, ssid);
+ ret = cfg80211_mgd_wext_giwessid(dev, info, data, ssid);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static int cfg80211_wext_siwpmksa(struct net_device *dev,
@@ -1440,6 +1555,7 @@ static int cfg80211_wext_siwpmksa(struct net_device *dev,
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
struct cfg80211_pmksa cfg_pmksa;
struct iw_pmksa *pmksa = (struct iw_pmksa *)extra;
+ int ret;
memset(&cfg_pmksa, 0, sizeof(struct cfg80211_pmksa));
@@ -1449,28 +1565,39 @@ static int cfg80211_wext_siwpmksa(struct net_device *dev,
cfg_pmksa.bssid = pmksa->bssid.sa_data;
cfg_pmksa.pmkid = pmksa->pmkid;
+ mutex_unlock(&rdev->mtx);
switch (pmksa->cmd) {
case IW_PMKSA_ADD:
- if (!rdev->ops->set_pmksa)
- return -EOPNOTSUPP;
-
- return rdev_set_pmksa(rdev, dev, &cfg_pmksa);
+ if (!rdev->ops->set_pmksa) {
+ ret = -EOPNOTSUPP;
+ break;
+ }
+ ret = rdev_set_pmksa(rdev, dev, &cfg_pmksa);
+ break;
case IW_PMKSA_REMOVE:
- if (!rdev->ops->del_pmksa)
- return -EOPNOTSUPP;
-
- return rdev_del_pmksa(rdev, dev, &cfg_pmksa);
+ if (!rdev->ops->del_pmksa) {
+ ret = -EOPNOTSUPP;
+ break;
+ }
+ ret = rdev_del_pmksa(rdev, dev, &cfg_pmksa);
+ break;
case IW_PMKSA_FLUSH:
- if (!rdev->ops->flush_pmksa)
- return -EOPNOTSUPP;
-
- return rdev_flush_pmksa(rdev, dev);
+ if (!rdev->ops->flush_pmksa) {
+ ret = -EOPNOTSUPP;
+ break;
+ }
+ ret = rdev_flush_pmksa(rdev, dev);
+ break;
default:
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ break;
}
+ mutex_unlock(&rdev->mtx);
+
+ return ret;
}
static const iw_handler cfg80211_handlers[] = {
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index c67d7a82ab13..ab4de0a50ad4 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -375,6 +375,7 @@ int cfg80211_wext_siwmlme(struct net_device *dev,
if (mlme->addr.sa_family != ARPHRD_ETHER)
return -EINVAL;
+ mutex_lock(&rdev->mtx);
wdev_lock(wdev);
switch (mlme->cmd) {
case IW_MLME_DEAUTH:
@@ -386,6 +387,7 @@ int cfg80211_wext_siwmlme(struct net_device *dev,
break;
}
wdev_unlock(wdev);
+ mutex_unlock(&rdev->mtx);
return err;
}

44
sys-kernel/pentoo-sources/files/4009_virt_wifi-fix-dealock-on-rtnl.patch
View file

@ -1,44 +0,0 @@
diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c
index 4b455a4ae15b..c878097f0dda 100644
--- a/drivers/net/wireless/virt_wifi.c
+++ b/drivers/net/wireless/virt_wifi.c
@@ -537,9 +537,7 @@ static int virt_wifi_newlink(struct net *src_net, struct net_device *dev,
dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
dev->ieee80211_ptr->wiphy = common_wiphy;
- wiphy_lock(common_wiphy);
err = register_netdevice(dev);
- wiphy_unlock(common_wiphy);
if (err) {
dev_err(&priv->lowerdev->dev, "can't register_netdevice: %d\n",
err);
@@ -562,9 +560,7 @@ static int virt_wifi_newlink(struct net *src_net, struct net_device *dev,
return 0;
unregister_netdev:
- wiphy_lock(common_wiphy);
unregister_netdevice(dev);
- wiphy_unlock(common_wiphy);
free_wireless_dev:
kfree(dev->ieee80211_ptr);
dev->ieee80211_ptr = NULL;
@@ -590,9 +586,7 @@ static void virt_wifi_dellink(struct net_device *dev,
netdev_rx_handler_unregister(priv->lowerdev);
netdev_upper_dev_unlink(priv->lowerdev, dev);
- wiphy_lock(common_wiphy);
unregister_netdevice_queue(dev, head);
- wiphy_unlock(common_wiphy);
module_put(THIS_MODULE);
/* Deleting the wiphy is handled in the module destructor. */
@@ -631,9 +625,7 @@ static int virt_wifi_event(struct notifier_block *this, unsigned long event,
upper_dev = priv->upperdev;
upper_dev->rtnl_link_ops->dellink(upper_dev, &list_kill);
- wiphy_lock(common_wiphy);
unregister_netdevice_many(&list_kill);
- wiphy_unlock(common_wiphy);
break;
}

97
sys-kernel/pentoo-sources/files/4010_rtnl-locking-fixes.patch
View file

@ -1,97 +0,0 @@
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e5e9d889f00f..3b45a9593e71 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3220,7 +3220,6 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
wdev = netdev->ieee80211_ptr;
wiphy_lock(&rdev->wiphy);
- rtnl_unlock();
/*
* end workaround code, by now the rdev is available
@@ -3230,6 +3229,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
if (info->attrs[NL80211_ATTR_WIPHY_NAME])
result = cfg80211_dev_rename(
rdev, nla_data(info->attrs[NL80211_ATTR_WIPHY_NAME]));
+ rtnl_unlock();
if (result)
goto out;
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 2e35cb78221e..0c6ea6212496 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -39,6 +39,7 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
struct cfg80211_registered_device *rdev;
struct vif_params vifparams;
enum nl80211_iftype type;
+ int ret;
rdev = wiphy_to_rdev(wdev->wiphy);
@@ -61,7 +62,11 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
memset(&vifparams, 0, sizeof(vifparams));
- return cfg80211_change_iface(rdev, dev, type, &vifparams);
+ wiphy_lock(wdev->wiphy);
+ ret = cfg80211_change_iface(rdev, dev, type, &vifparams);
+ wiphy_unlock(wdev->wiphy);
+
+ return ret;
}
EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode);
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 0c6ea6212496..a8320dc59af7 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -655,6 +655,7 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
bool remove = false;
struct key_params params;
u32 cipher;
+ int ret;
if (wdev->iftype != NL80211_IFTYPE_STATION &&
wdev->iftype != NL80211_IFTYPE_ADHOC)
@@ -726,12 +727,16 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
params.seq_len = 6;
}
- return cfg80211_set_encryption(
+ wiphy_lock(wdev->wiphy);
+ ret = cfg80211_set_encryption(
rdev, dev,
!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY),
addr, remove,
ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY,
idx, &params);
+ wiphy_unlock(wdev->wiphy);
+
+ return ret;
}
static int cfg80211_wext_giwencode(struct net_device *dev,
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 200cd9f5fd5f..18f9a5c214b5 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -334,6 +334,7 @@ void cfg80211_destroy_ifaces(struct cfg80211_registered_device *rdev)
struct wireless_dev *wdev, *tmp;
ASSERT_RTNL();
+ lockdep_assert_wiphy(&rdev->wiphy);
list_for_each_entry_safe(wdev, tmp, &rdev->wiphy.wdev_list, list) {
if (wdev->nl_owner_dead)
@@ -349,7 +350,9 @@ static void cfg80211_destroy_iface_wk(struct work_struct *work)
destroy_work);
rtnl_lock();
+ wiphy_lock(&rdev->wiphy);
cfg80211_destroy_ifaces(rdev);
+ wiphy_unlock(&rdev->wiphy);
rtnl_unlock();
}

76
sys-kernel/pentoo-sources/files/4011_nl80211-fix-locking-netns-change.patch
View file

@ -1,76 +0,0 @@
From eadf7c43781bb0c33333211d0b842ab5c576f3ba Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 10 Mar 2021 21:50:04 +0100
Subject: [PATCH] nl80211: fix locking for wireless device netns change
We have all the network interfaces marked as netns-local
since the only reasonable thing to do right now is to set
a whole device, including all netdevs, into a different
network namespace. For this reason, we also have our own
way of changing the network namespace.
Unfortunately, the RTNL locking changes broke this, and
it now results in many RTNL assertions. The trivial fix
for those (just hold RTNL for the changes) however leads
to deadlocks in the cfg80211 netdev notifier.
Since we only need the wiphy, and that's still protected
by the RTNL, add a new NL80211_FLAG_NO_WIPHY_MTX flag to
the nl80211 ops and use it to _not_ take the wiphy mutex
but only the RTNL. This way, the notifier does all the
work necessary during unregistration/registration of the
netdevs from the old and in the new namespace.
Change-Id: I5fc6cf6676f800ab8008e03bbea9c3349b02d804
Reported-by: Sid Hayn <sidhayn@gmail.com>
Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/wireless/nl80211.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 521d36bb0803..ae6097fff133 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -14789,6 +14789,7 @@ static int nl80211_set_tid_config(struct sk_buff *skb,
#define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
NL80211_FLAG_CHECK_NETDEV_UP)
#define NL80211_FLAG_CLEAR_SKB 0x20
+#define NL80211_FLAG_NO_WIPHY_MTX 0x40
static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
struct genl_info *info)
@@ -14840,7 +14841,7 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
info->user_ptr[0] = rdev;
}
- if (rdev) {
+ if (rdev && !(ops->internal_flags & NL80211_FLAG_NO_WIPHY_MTX)) {
wiphy_lock(&rdev->wiphy);
/* we keep the mutex locked until post_doit */
__release(&rdev->wiphy.mtx);
@@ -14865,7 +14866,8 @@ static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
}
}
- if (info->user_ptr[0]) {
+ if (info->user_ptr[0] &&
+ !(ops->internal_flags & NL80211_FLAG_NO_WIPHY_MTX)) {
struct cfg80211_registered_device *rdev = info->user_ptr[0];
/* we kept the mutex locked since pre_doit */
@@ -15329,7 +15331,9 @@ static const struct genl_small_ops nl80211_small_ops[] = {
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = nl80211_wiphy_netns,
.flags = GENL_UNS_ADMIN_PERM,
- .internal_flags = NL80211_FLAG_NEED_WIPHY,
+ .internal_flags = NL80211_FLAG_NEED_WIPHY |
+ NL80211_FLAG_NEED_RTNL |
+ NL80211_FLAG_NO_WIPHY_MTX,
},
{
.cmd = NL80211_CMD_GET_SURVEY,
--
2.29.2

11104
sys-kernel/pentoo-sources/files/config-amd64-5.10.78
View file

File diff suppressed because it is too large Load diff

11413
sys-kernel/pentoo-sources/files/config-amd64-5.14.16
View file

File diff suppressed because it is too large Load diff

0
sys-kernel/pentoo-sources/files/config-amd64-5.15.12 → sys-kernel/pentoo-sources/files/config-amd64-5.15.13
View file

2
sys-kernel/pentoo-sources/files/config-amd64-latest
View file

@ -1 +1 @@
config-amd64-5.15.12
config-amd64-5.15.13

10327
sys-kernel/pentoo-sources/files/config-x86-5.10.78
View file

File diff suppressed because it is too large Load diff

10398
sys-kernel/pentoo-sources/files/config-x86-5.11.16
View file

File diff suppressed because it is too large Load diff

10456
sys-kernel/pentoo-sources/files/config-x86-5.12.19
View file

File diff suppressed because it is too large Load diff

10527
sys-kernel/pentoo-sources/files/config-x86-5.13.19
View file

File diff suppressed because it is too large Load diff

10580
sys-kernel/pentoo-sources/files/config-x86-5.14.16
View file

File diff suppressed because it is too large Load diff

0
sys-kernel/pentoo-sources/files/config-x86-5.15.12 → sys-kernel/pentoo-sources/files/config-x86-5.15.13
View file

2
sys-kernel/pentoo-sources/files/config-x86-latest
View file

@ -1 +1 @@
config-x86-5.15.12
config-x86-5.15.13

65
sys-kernel/pentoo-sources/pentoo-sources-5.10.78.ebuild
View file

@ -1,65 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
K_GENPATCHES_VER="85"
inherit kernel-2
detect_version
detect_arch
KEYWORDS="amd64 x86"
HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
IUSE="experimental +lts pax_kernel pentoo-experimental"
DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
pkg_setup() {
if use pax_kernel; then
die "pax_kernel is no longer available, you MUST ensure the use flag is no longer set"
fi
}
src_unpack() {
#default
kernel-2_src_unpack
#penpatches
eapply -s "${FILESDIR}/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch"
eapply -s "${FILESDIR}/4004_zd1211rw-inject+dbi-fix-4.7ish.patch"
eapply -s "${FILESDIR}/4005_ipw2200-inject-4.7ish.patch"
eapply -s "${FILESDIR}/4400_logo_larry_the_cow.patch"
#backported from 5.12 by johill for us https://p.sipsolutions.net/f457f6b7174c5fa7.txt
eapply -s "${FILESDIR}/4008_cfg80211-change-netdev-rtnl-lock.patch"
eapply -s "${FILESDIR}/4009_virt_wifi-fix-dealock-on-rtnl.patch"
eapply -s "${FILESDIR}/4010_rtnl-locking-fixes.patch"
eapply -s "${FILESDIR}/4011_nl80211-fix-locking-netns-change.patch"
#experimental penpatches
#if use pentoo-experimental; then
#eapply -s "${FILESDIR}/something_experimental.patch"
#fi
}
src_install() {
kernel-2_src_install
insinto /usr/share/${PN}
if use amd64; then
doins "${FILESDIR}"/config-amd64-${PVR}
elif use x86; then
doins "${FILESDIR}"/config-x86-${PVR}
fi
}
pkg_postinst() {
kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
ewarn "The official pentoo kernel config is now installed with the kernel in /usr/share/pentoo-sources"
}
pkg_postrm() {
kernel-2_pkg_postrm
}

55
sys-kernel/pentoo-sources/pentoo-sources-5.14.16.ebuild
View file

@ -1,55 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
K_GENPATCHES_VER="17"
inherit kernel-2
detect_version
detect_arch
KEYWORDS="amd64 x86"
HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
IUSE="experimental pax_kernel"
DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
pkg_setup() {
if use pax_kernel; then
die "pax_kernel is no longer available, you MUST ensure the use flag is no longer set"
fi
}
src_unpack() {
#default
kernel-2_src_unpack
#penpatches
eapply -s "${FILESDIR}/4004_zd1211rw-inject+dbi-fix-4.7ish.patch"
eapply -s "${FILESDIR}/4005_ipw2200-inject-4.7ish.patch"
eapply -s "${FILESDIR}/4400_logo_larry_the_cow.patch"
}
src_install() {
kernel-2_src_install
insinto /usr/share/${PN}
if use amd64; then
doins "${FILESDIR}"/config-amd64-${PVR}
elif use x86; then
doins "${FILESDIR}"/config-x86-${PVR}
fi
}
pkg_postinst() {
kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
ewarn "The official pentoo kernel config is now installed with the kernel in /usr/share/pentoo-sources"
}
pkg_postrm() {
kernel-2_pkg_postrm
}

0
sys-kernel/pentoo-sources/pentoo-sources-5.15.12.ebuild → sys-kernel/pentoo-sources/pentoo-sources-5.15.13.ebuild
View file