pull request: wireless-2.6 2009-10-13
Subsystems (4)
Dave,
Here are a few (almost-)one-liners for 2.6.32. Included are fixes for a use-after-free, a missing "!" in front of a memcmp when comparing BSSIDs, a race when using hardware-based scanning, the ieee80211_rx context problem, a related documentation change, and a minor build issue.
Please let me know if there are problems!
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit 10c435f18b8cb78a5870c08d52955594f5ec9c31:
David S. Miller (1):
net: Link in PHY drivers before others.
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Alan Cox (1):
libertas: fix build
Felix Fietkau (1):
mac80211: fix logic error ibss merge bssid check
Johannes Berg (3):
mac80211: fix ibss race
b43: fix ieee80211_rx() context
mac80211: document ieee80211_rx() context requirementWey-Yi Guy (1):
iwlwifi: change the order of freeing memory
drivers/net/wireless/b43/xmit.c | 3 +++ drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/net/wireless/libertas/cmdresp.c | 1 + include/net/mac80211.h | 2 ++ net/mac80211/ibss.c | 4 ++-- net/mac80211/rx.c | 2 ++ 7 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/b43/xmit.c +3 -0
@@ -690,7 +690,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) }memcpy (IEEE80211_SKB_RXCB (skb), &status,sizeof (status)); + +local_bh_disable ();ieee80211_rx (dev->wl->hw, skb); +local_bh_enable ();#if B43_DEBUG dev->rx_count++;
drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1
@@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) out_pci_disable_device:pci_disable_device (pdev); out_ieee80211_free_hw: -ieee80211_free_hw (priv->hw);iwl_free_traffic_mem (priv); +ieee80211_free_hw (priv->hw); out:return err; }
drivers/net/wireless/iwlwifi/iwl3945-base.c +1 -1
@@ -4096,8 +4096,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *epci_set_drvdata (pdev,NULL );pci_disable_device (pdev); out_ieee80211_free_hw: -ieee80211_free_hw (priv->hw);iwl_free_traffic_mem (priv); +ieee80211_free_hw (priv->hw); out:return err; }
drivers/net/wireless/libertas/cmdresp.c +1 -0
@@ -3,6 +3,7 @@* responses as well as events generated by firmware. */ #include <linux/delay.h> +#include <linux/sched.h> #include <linux/if_arp.h> #include <linux/netdevice.h> #include <asm/unaligned.h>
include/net/mac80211.h +2 -0
@@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);* to this function and ieee80211_rx_irqsafe() may not be mixed for a * single hardware. * +* Note that right now, this function must be called with softirqs disabled. +* * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call */
net/mac80211/ibss.c +2 -2
@@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) "%pM\n", bss->cbss.bssid, ifibss->bssid);#endif /* CONFIG_MAC80211_IBSS_DEBUG */ -if (bss &&memcmp (ifibss->bssid, bss->cbss.bssid,ETH_ALEN )) { +if (bss && !memcmp (ifibss->bssid, bss->cbss.bssid,ETH_ALEN )) {printk (KERN_DEBUG "%s: Selected IBSS BSSID %pM" " based on configured SSID\n" , sdata->dev->name, bss->cbss.bssid);
@@ -829,7 +829,7 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local)if (!sdata->u.ibss.ssid_len)continue ; sdata->u.ibss.last_scan_completed = jiffies; -ieee80211_sta_find_ibss (sdata); +mod_timer (&sdata->u.ibss.timer,0 ); }mutex_unlock (&local->iflist_mtx); }
net/mac80211/rx.c +2 -0
@@ -2453,6 +2453,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)struct ieee80211_supported_band *sband;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb); +WARN_ON_ONCE (softirq_count () ==0 ); +if (WARN_ON (status->band <0 || status->band >=IEEE80211_NUM_BANDS )) goto drop;
Signature · 6 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Tue, 13 Oct 2009 11:05:58 -0400
Quoted 7 lines
Here are a few (almost-)one-liners for 2.6.32. Included are fixes for a use-after-free, a missing "!" in front of a memcmp when comparing BSSIDs, a race when using hardware-based scanning, the
ieee80211_rxcontext problem, a related documentation change, and a minor build issue.Please let me know if there are problems!
Pulled, thanks a lot!