iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mwifiex: use alloc_workqueue's format strings capabilities for WQ names

Browse Source 
alloc_workqueue() has string format formation ability e.g. wqname%ifname
will be treated as wqnameifname. Use this and remove string operations
while defining strings for workqueue names.

Reported-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Avinash Patil 2015-02-06 19:58:05 +05:30 committed by Kalle Valo
parent 01317c2641
commit ffdcad0596
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2397,7 +2397,6 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
} }
#define MWIFIEX_MAX_WQ_LEN 30
/* /*
* create a new virtual interface with the given name * create a new virtual interface with the given name
*/ */
@ -2411,7 +2410,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;
char dfs_cac_str[MWIFIEX_MAX_WQ_LEN], dfs_chsw_str[MWIFIEX_MAX_WQ_LEN];
if (!adapter) if (!adapter)
return ERR_PTR(-EFAULT); return ERR_PTR(-EFAULT);
@ -2576,12 +2574,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
return ERR_PTR(-EFAULT); return ERR_PTR(-EFAULT);
} }
strcpy(dfs_cac_str, "MWIFIEX_DFS_CAC"); priv->dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC%s",
strcat(dfs_cac_str, name);
priv->dfs_cac_workqueue = alloc_workqueue(dfs_cac_str,
WQ_HIGHPRI | WQ_HIGHPRI |
WQ_MEM_RECLAIM | WQ_MEM_RECLAIM |
WQ_UNBOUND, 1); WQ_UNBOUND, 1, name);
if (!priv->dfs_cac_workqueue) { if (!priv->dfs_cac_workqueue) {
wiphy_err(wiphy, "cannot register virtual network device\n"); wiphy_err(wiphy, "cannot register virtual network device\n");
free_netdev(dev); free_netdev(dev);
@ -2594,11 +2590,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
INIT_DELAYED_WORK(&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue); INIT_DELAYED_WORK(&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue);
strcpy(dfs_chsw_str, "MWIFIEX_DFS_CHSW"); priv->dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW%s",
strcat(dfs_chsw_str, name);
priv->dfs_chan_sw_workqueue = alloc_workqueue(dfs_chsw_str,
WQ_HIGHPRI | WQ_UNBOUND | WQ_HIGHPRI | WQ_UNBOUND |
WQ_MEM_RECLAIM, 1); WQ_MEM_RECLAIM, 1, name);
if (!priv->dfs_chan_sw_workqueue) { if (!priv->dfs_chan_sw_workqueue) {
wiphy_err(wiphy, "cannot register virtual network device\n"); wiphy_err(wiphy, "cannot register virtual network device\n");
free_netdev(dev); free_netdev(dev);