korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-14 01:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

mwifiex: do not declare wdev as pointer

Browse Source 
wdev is used even after del_virtual_interface handler in cfg80211
in nl80211_post_doit. Since we have freed wdev in handling of
del_virtual_intf, this can result into crash while deleting
interface.
Avoid this be not declaring wdev which part of
mwifiex_private structure but struct wireless_dev type.

Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Avinash Patil 2015-01-28 15:42:00 +05:30 committed by Kalle Valo
parent 09f63ae65f
commit 4facc34a1f
12 changed files with 44 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/mwifiex/11h.c
View File

@ -39,7 +39,7 @@ mwifiex_11h_process_infra_join(struct mwifiex_private *priv, u8 **buffer,
return; return;
radio_type = mwifiex_band_to_radio_type((u8) bss_desc->bss_band); radio_type = mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
sband = priv->wdev->wiphy->bands[radio_type]; sband = priv->wdev.wiphy->bands[radio_type];
cap = (struct mwifiex_ie_types_pwr_capability *)*buffer; cap = (struct mwifiex_ie_types_pwr_capability *)*buffer;
cap->header.type = cpu_to_le16(WLAN_EID_PWR_CAPABILITY); cap->header.type = cpu_to_le16(WLAN_EID_PWR_CAPABILITY);

4
drivers/net/wireless/mwifiex/11n.c
View File

@ -39,7 +39,7 @@ int mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type,
{ {
uint16_t ht_ext_cap = le16_to_cpu(ht_cap->extended_ht_cap_info); uint16_t ht_ext_cap = le16_to_cpu(ht_cap->extended_ht_cap_info);
struct ieee80211_supported_band *sband = struct ieee80211_supported_band *sband =
priv->wdev->wiphy->bands[radio_type]; priv->wdev.wiphy->bands[radio_type];
if (WARN_ON_ONCE(!sband)) { if (WARN_ON_ONCE(!sband)) {
dev_err(priv->adapter->dev, "Invalid radio type!\n"); dev_err(priv->adapter->dev, "Invalid radio type!\n");
@ -314,7 +314,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
return ret_len; return ret_len;
radio_type = mwifiex_band_to_radio_type((u8) bss_desc->bss_band); radio_type = mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
sband = priv->wdev->wiphy->bands[radio_type]; sband = priv->wdev.wiphy->bands[radio_type];
if (bss_desc->bcn_ht_cap) { if (bss_desc->bcn_ht_cap) {
ht_cap = (struct mwifiex_ie_types_htcap *) *buffer; ht_cap = (struct mwifiex_ie_types_htcap *) *buffer;

2
drivers/net/wireless/mwifiex/11n_rxreorder.c
View File

@ -45,7 +45,7 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv,
skb_trim(skb, le16_to_cpu(local_rx_pd->rx_pkt_length)); skb_trim(skb, le16_to_cpu(local_rx_pd->rx_pkt_length));
ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr, ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr,
priv->wdev->iftype, 0, false); priv->wdev.iftype, 0, false);
while (!skb_queue_empty(&list)) { while (!skb_queue_empty(&list)) {
rx_skb = __skb_dequeue(&list); rx_skb = __skb_dequeue(&list);

70
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -1590,15 +1590,15 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)
ie_len = ie_buf[1] + sizeof(struct ieee_types_header); ie_len = ie_buf[1] + sizeof(struct ieee_types_header);
band = mwifiex_band_to_radio_type(priv->curr_bss_params.band); band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);
chan = __ieee80211_get_channel(priv->wdev->wiphy, chan = __ieee80211_get_channel(priv->wdev.wiphy,
ieee80211_channel_to_frequency(bss_info.bss_chan, ieee80211_channel_to_frequency(bss_info.bss_chan,
band)); band));
bss = cfg80211_inform_bss(priv->wdev->wiphy, chan, bss = cfg80211_inform_bss(priv->wdev.wiphy, chan,
CFG80211_BSS_FTYPE_UNKNOWN, CFG80211_BSS_FTYPE_UNKNOWN,
bss_info.bssid, 0, WLAN_CAPABILITY_IBSS, bss_info.bssid, 0, WLAN_CAPABILITY_IBSS,
0, ie_buf, ie_len, 0, GFP_KERNEL); 0, ie_buf, ie_len, 0, GFP_KERNEL);
cfg80211_put_bss(priv->wdev->wiphy, bss); cfg80211_put_bss(priv->wdev.wiphy, bss);
memcpy(priv->cfg_bssid, bss_info.bssid, ETH_ALEN); memcpy(priv->cfg_bssid, bss_info.bssid, ETH_ALEN);
return 0; return 0;
@ -1719,12 +1719,12 @@ done:
/* Find the BSS we want using available scan results */ /* Find the BSS we want using available scan results */
if (mode == NL80211_IFTYPE_ADHOC) if (mode == NL80211_IFTYPE_ADHOC)
bss = cfg80211_get_bss(priv->wdev->wiphy, channel, bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
bssid, ssid, ssid_len, bssid, ssid, ssid_len,
WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS,
WLAN_CAPABILITY_IBSS); WLAN_CAPABILITY_IBSS);
else else
bss = cfg80211_get_bss(priv->wdev->wiphy, channel, bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
bssid, ssid, ssid_len, bssid, ssid, ssid_len,
WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS,
WLAN_CAPABILITY_ESS); WLAN_CAPABILITY_ESS);
@ -1781,7 +1781,7 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
return -EINVAL; return -EINVAL;
} }
if (priv->wdev && priv->wdev->current_bss) { if (priv->wdev.current_bss) {
wiphy_warn(wiphy, "%s: already connected\n", dev->name); wiphy_warn(wiphy, "%s: already connected\n", dev->name);
return -EALREADY; return -EALREADY;
} }
@ -1839,7 +1839,7 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
static int mwifiex_set_ibss_params(struct mwifiex_private *priv, static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
struct cfg80211_ibss_params *params) struct cfg80211_ibss_params *params)
{ {
struct wiphy *wiphy = priv->wdev->wiphy; struct wiphy *wiphy = priv->wdev.wiphy;
struct mwifiex_adapter *adapter = priv->adapter; struct mwifiex_adapter *adapter = priv->adapter;
int index = 0, i; int index = 0, i;
u8 config_bands = 0; u8 config_bands = 0;
@ -2177,7 +2177,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
struct mwifiex_private *priv; struct mwifiex_private *priv;
struct net_device *dev; struct net_device *dev;
void *mdev_priv; void *mdev_priv;
struct wireless_dev *wdev;
if (!adapter) if (!adapter)
return ERR_PTR(-EFAULT); return ERR_PTR(-EFAULT);
@ -2193,13 +2192,8 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL); priv->wdev.wiphy = wiphy;
if (!wdev) priv->wdev.iftype = NL80211_IFTYPE_STATION;
return ERR_PTR(-ENOMEM);
wdev->wiphy = wiphy;
priv->wdev = wdev;
wdev->iftype = NL80211_IFTYPE_STATION;
if (type == NL80211_IFTYPE_UNSPECIFIED) if (type == NL80211_IFTYPE_UNSPECIFIED)
priv->bss_mode = NL80211_IFTYPE_STATION; priv->bss_mode = NL80211_IFTYPE_STATION;
@ -2221,13 +2215,8 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL); priv->wdev.wiphy = wiphy;
if (!wdev) priv->wdev.iftype = NL80211_IFTYPE_AP;
return ERR_PTR(-ENOMEM);
priv->wdev = wdev;
wdev->wiphy = wiphy;
wdev->iftype = NL80211_IFTYPE_AP;
priv->bss_type = MWIFIEX_BSS_TYPE_UAP; priv->bss_type = MWIFIEX_BSS_TYPE_UAP;
priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II; priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
@ -2246,17 +2235,12 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL); priv->wdev.wiphy = wiphy;
if (!wdev)
return ERR_PTR(-ENOMEM);
priv->wdev = wdev;
wdev->wiphy = wiphy;
/* At start-up, wpa_supplicant tries to change the interface /* At start-up, wpa_supplicant tries to change the interface
* to NL80211_IFTYPE_STATION if it is not managed mode. * to NL80211_IFTYPE_STATION if it is not managed mode.
*/ */
wdev->iftype = NL80211_IFTYPE_P2P_CLIENT; priv->wdev.iftype = NL80211_IFTYPE_P2P_CLIENT;
priv->bss_mode = NL80211_IFTYPE_P2P_CLIENT; priv->bss_mode = NL80211_IFTYPE_P2P_CLIENT;
/* Setting bss_type to P2P tells firmware that this interface /* Setting bss_type to P2P tells firmware that this interface
@ -2272,8 +2256,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
priv->bss_num = 0; priv->bss_num = 0;
if (mwifiex_cfg80211_init_p2p_client(priv)) { if (mwifiex_cfg80211_init_p2p_client(priv)) {
wdev = ERR_PTR(-EFAULT); memset(&priv->wdev, 0, sizeof(priv->wdev));
goto done; priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
return ERR_PTR(-EFAULT);
} }
break; break;
@ -2287,9 +2272,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
IEEE80211_NUM_ACS, 1); IEEE80211_NUM_ACS, 1);
if (!dev) { if (!dev) {
wiphy_err(wiphy, "no memory available for netdevice\n"); wiphy_err(wiphy, "no memory available for netdevice\n");
memset(&priv->wdev, 0, sizeof(priv->wdev));
priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED; priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
wdev = ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
goto done;
} }
mwifiex_init_priv_params(priv, dev); mwifiex_init_priv_params(priv, dev);
@ -2309,7 +2295,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
&wiphy->bands[IEEE80211_BAND_5GHZ]->vht_cap, priv); &wiphy->bands[IEEE80211_BAND_5GHZ]->vht_cap, priv);
dev_net_set(dev, wiphy_net(wiphy)); dev_net_set(dev, wiphy_net(wiphy));
dev->ieee80211_ptr = priv->wdev; dev->ieee80211_ptr = &priv->wdev;
dev->ieee80211_ptr->iftype = priv->bss_mode; dev->ieee80211_ptr->iftype = priv->bss_mode;
memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN); memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN);
SET_NETDEV_DEV(dev, wiphy_dev(wiphy)); SET_NETDEV_DEV(dev, wiphy_dev(wiphy));
@ -2330,8 +2316,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
free_netdev(dev); free_netdev(dev);
priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED; priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
priv->netdev = NULL; priv->netdev = NULL;
wdev = ERR_PTR(-EFAULT); memset(&priv->wdev, 0, sizeof(priv->wdev));
goto done; priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
return ERR_PTR(-EFAULT);
} }
sema_init(&priv->async_sem, 1); sema_init(&priv->async_sem, 1);
@ -2342,13 +2329,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
mwifiex_dev_debugfs_init(priv); mwifiex_dev_debugfs_init(priv);
#endif #endif
done: return &priv->wdev;
if (IS_ERR(wdev)) {
kfree(priv->wdev);
priv->wdev = NULL;
}
return wdev;
} }
EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf); EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
@ -2374,8 +2355,7 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
/* Clear the priv in adapter */ /* Clear the priv in adapter */
priv->netdev->ieee80211_ptr = NULL; priv->netdev->ieee80211_ptr = NULL;
priv->netdev = NULL; priv->netdev = NULL;
kfree(wdev); priv->wdev.iftype = NL80211_IFTYPE_UNSPECIFIED;
priv->wdev = NULL;
priv->media_connected = false; priv->media_connected = false;

4
drivers/net/wireless/mwifiex/cfp.c
View File

@ -322,9 +322,9 @@ mwifiex_get_cfp(struct mwifiex_private *priv, u8 band, u16 channel, u32 freq)
return cfp; return cfp;
if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG) if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG)
sband = priv->wdev->wiphy->bands[IEEE80211_BAND_2GHZ]; sband = priv->wdev.wiphy->bands[IEEE80211_BAND_2GHZ];
else else
sband = priv->wdev->wiphy->bands[IEEE80211_BAND_5GHZ]; sband = priv->wdev.wiphy->bands[IEEE80211_BAND_5GHZ];
if (!sband) { if (!sband) {
dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d\n", dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d\n",

5
drivers/net/wireless/mwifiex/main.c
View File

@ -1203,8 +1203,9 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
continue; continue;
rtnl_lock(); rtnl_lock();
if (priv->wdev && priv->netdev) if (priv->netdev &&
mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev); priv->wdev.iftype != NL80211_IFTYPE_UNSPECIFIED)
mwifiex_del_virtual_intf(adapter->wiphy, &priv->wdev);
rtnl_unlock(); rtnl_unlock();
} }

2
drivers/net/wireless/mwifiex/main.h
View File

@ -547,7 +547,7 @@ struct mwifiex_private {
u32 curr_bcn_size; u32 curr_bcn_size;
/* spin lock for beacon buffer */ /* spin lock for beacon buffer */
spinlock_t curr_bcn_buf_lock; spinlock_t curr_bcn_buf_lock;
struct wireless_dev *wdev; struct wireless_dev wdev;
struct mwifiex_chan_freq_power cfp; struct mwifiex_chan_freq_power cfp;
char version_str[128]; char version_str[128];
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS

10
drivers/net/wireless/mwifiex/scan.c
View File

@ -496,10 +496,10 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
for (band = 0; (band < IEEE80211_NUM_BANDS) ; band++) { for (band = 0; (band < IEEE80211_NUM_BANDS) ; band++) {
if (!priv->wdev->wiphy->bands[band]) if (!priv->wdev.wiphy->bands[band])
continue; continue;
sband = priv->wdev->wiphy->bands[band]; sband = priv->wdev.wiphy->bands[band];
for (i = 0; (i < sband->n_channels) ; i++) { for (i = 0; (i < sband->n_channels) ; i++) {
ch = &sband->channels[i]; ch = &sband->channels[i];
@ -1733,10 +1733,10 @@ mwifiex_parse_single_response_buf(struct mwifiex_private *priv, u8 **bss_info,
freq = cfp ? cfp->freq : 0; freq = cfp ? cfp->freq : 0;
chan = ieee80211_get_channel(priv->wdev->wiphy, freq); chan = ieee80211_get_channel(priv->wdev.wiphy, freq);
if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) {
bss = cfg80211_inform_bss(priv->wdev->wiphy, bss = cfg80211_inform_bss(priv->wdev.wiphy,
chan, CFG80211_BSS_FTYPE_UNKNOWN, chan, CFG80211_BSS_FTYPE_UNKNOWN,
bssid, timestamp, bssid, timestamp,
cap_info_bitmap, beacon_period, cap_info_bitmap, beacon_period,
@ -1748,7 +1748,7 @@ mwifiex_parse_single_response_buf(struct mwifiex_private *priv, u8 **bss_info,
!memcmp(bssid, priv->curr_bss_params.bss_descriptor !memcmp(bssid, priv->curr_bss_params.bss_descriptor
.mac_address, ETH_ALEN)) .mac_address, ETH_ALEN))
mwifiex_update_curr_bss_params(priv, bss); mwifiex_update_curr_bss_params(priv, bss);
cfg80211_put_bss(priv->wdev->wiphy, bss); cfg80211_put_bss(priv->wdev.wiphy, bss);
} }
} else { } else {
dev_dbg(adapter->dev, "missing BSS channel IE\n"); dev_dbg(adapter->dev, "missing BSS channel IE\n");

2
drivers/net/wireless/mwifiex/sta_event.c
View File

@ -487,7 +487,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
case EVENT_REMAIN_ON_CHAN_EXPIRED: case EVENT_REMAIN_ON_CHAN_EXPIRED:
dev_dbg(adapter->dev, "event: Remain on channel expired\n"); dev_dbg(adapter->dev, "event: Remain on channel expired\n");
cfg80211_remain_on_channel_expired(priv->wdev, cfg80211_remain_on_channel_expired(&priv->wdev,
priv->roc_cfg.cookie, priv->roc_cfg.cookie,
&priv->roc_cfg.chan, &priv->roc_cfg.chan,
GFP_ATOMIC); GFP_ATOMIC);

2
drivers/net/wireless/mwifiex/sta_ioctl.c
View File

@ -219,7 +219,7 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
if (!strncmp(priv->adapter->country_code, &country_ie[2], 2)) { if (!strncmp(priv->adapter->country_code, &country_ie[2], 2)) {
rcu_read_unlock(); rcu_read_unlock();
wiphy_dbg(priv->wdev->wiphy, wiphy_dbg(priv->wdev.wiphy,
"11D: skip setting domain info in FW\n"); "11D: skip setting domain info in FW\n");
return 0; return 0;
} }

2
drivers/net/wireless/mwifiex/txrx.c
View File

@ -227,7 +227,7 @@ void mwifiex_parse_tx_status_event(struct mwifiex_private *priv,
/* consumes ack_skb */ /* consumes ack_skb */
skb_complete_wifi_ack(ack_skb, !tx_status->status); skb_complete_wifi_ack(ack_skb, !tx_status->status);
} else { } else {
cfg80211_mgmt_tx_status(priv->wdev, tx_info->cookie, cfg80211_mgmt_tx_status(&priv->wdev, tx_info->cookie,
ack_skb->data, ack_skb->len, ack_skb->data, ack_skb->len,
!tx_status->status, GFP_ATOMIC); !tx_status->status, GFP_ATOMIC);
dev_kfree_skb_any(ack_skb); dev_kfree_skb_any(ack_skb);

2
drivers/net/wireless/mwifiex/util.c
View File

@ -387,7 +387,7 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
pkt_len -= ETH_ALEN + sizeof(pkt_len); pkt_len -= ETH_ALEN + sizeof(pkt_len);
rx_pd->rx_pkt_length = cpu_to_le16(pkt_len); rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);
cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq, cfg80211_rx_mgmt(&priv->wdev, priv->roc_cfg.chan.center_freq,
CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len, CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len,
0); 0);