ath9k: reject invalid antenna mask configurations
SVN-Revision: 32507
This commit is contained in:
parent
2479910d45
commit
3d83a7b636
1 changed files with 28 additions and 0 deletions
|
@ -0,0 +1,28 @@
|
|||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1929,12 +1929,24 @@ static u32 fill_chainmask(u32 cap, u32 n
|
||||
return filled;
|
||||
}
|
||||
|
||||
+static bool validate_antenna_mask(u32 val)
|
||||
+{
|
||||
+ switch (val & 0x7) {
|
||||
+ case 0x1:
|
||||
+ case 0x3:
|
||||
+ case 0x7:
|
||||
+ return true;
|
||||
+ default:
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
|
||||
{
|
||||
struct ath_softc *sc = hw->priv;
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
|
||||
- if (!rx_ant || !tx_ant)
|
||||
+ if (!validate_antenna_mask(rx_ant) || !validate_antenna_mask(tx_ant))
|
||||
return -EINVAL;
|
||||
|
||||
sc->ant_rx = rx_ant;
|
Loading…
Reference in a new issue