microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: brcm80211: fix perimeter locking in wl_ops_bss_info_changed 

Several code path in the wl_ops_bss_info_changed() callback were not
using the perimeter lock. This gives potential of raise conditions
so lock/unlock calls have been added.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: Roland Vossen <rvossen@broadcoom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2011-05-09 16:32:53 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель dc762c4f85
Коммит c876ce07da
1 изменённых файлов: 11 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Просмотреть файл

@ -340,7 +340,9 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
*/ */
wiphy_err(wiphy, "%s: %s: %sassociated\n", KBUILD_MODNAME, wiphy_err(wiphy, "%s: %s: %sassociated\n", KBUILD_MODNAME,
__func__, info->assoc ? "" : "dis"); __func__, info->assoc ? "" : "dis");
WL_LOCK(wl);
wlc_associate_upd(wl->wlc, info->assoc); wlc_associate_upd(wl->wlc, info->assoc);
WL_UNLOCK(wl);
} }
if (changed & BSS_CHANGED_ERP_SLOT) { if (changed & BSS_CHANGED_ERP_SLOT) {
/* slot timing changed */ /* slot timing changed */
@ -356,12 +358,15 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_HT) { if (changed & BSS_CHANGED_HT) {
/* 802.11n parameters changed */ /* 802.11n parameters changed */
u16 mode = info->ht_operation_mode; u16 mode = info->ht_operation_mode;
WL_LOCK(wl);
wlc_protection_upd(wl->wlc, WLC_PROT_N_CFG, wlc_protection_upd(wl->wlc, WLC_PROT_N_CFG,
mode & IEEE80211_HT_OP_MODE_PROTECTION); mode & IEEE80211_HT_OP_MODE_PROTECTION);
wlc_protection_upd(wl->wlc, WLC_PROT_N_NONGF, wlc_protection_upd(wl->wlc, WLC_PROT_N_NONGF,
mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
wlc_protection_upd(wl->wlc, WLC_PROT_N_OBSS, wlc_protection_upd(wl->wlc, WLC_PROT_N_OBSS,
mode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT); mode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT);
WL_UNLOCK(wl);
} }
if (changed & BSS_CHANGED_BASIC_RATES) { if (changed & BSS_CHANGED_BASIC_RATES) {
struct ieee80211_supported_band *bi; struct ieee80211_supported_band *bi;
@ -370,13 +375,11 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
struct wl_rateset rs; struct wl_rateset rs;
int error; int error;
/* Basic rateset changed */
no_printk("%s: change basic rates: 0x%x\n",
__func__, (u32) info->basic_rates);
/* retrieve the current rates */ /* retrieve the current rates */
WL_LOCK(wl);
error = wlc_ioctl(wl->wlc, WLC_GET_CURR_RATESET, error = wlc_ioctl(wl->wlc, WLC_GET_CURR_RATESET,
&rs, sizeof(rs), NULL); &rs, sizeof(rs), NULL);
WL_UNLOCK(wl);
if (error) { if (error) {
wiphy_err(wiphy, "%s: retrieve rateset failed: %d\n", wiphy_err(wiphy, "%s: retrieve rateset failed: %d\n",
__func__, error); __func__, error);
@ -394,11 +397,15 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
} }
/* update the rate set */ /* update the rate set */
WL_LOCK(wl);
wlc_ioctl(wl->wlc, WLC_SET_RATESET, &rs, sizeof(rs), NULL); wlc_ioctl(wl->wlc, WLC_SET_RATESET, &rs, sizeof(rs), NULL);
WL_UNLOCK(wl);
} }
if (changed & BSS_CHANGED_BEACON_INT) { if (changed & BSS_CHANGED_BEACON_INT) {
/* Beacon interval changed */ /* Beacon interval changed */
WL_LOCK(wl);
wlc_set(wl->wlc, WLC_SET_BCNPRD, info->beacon_int); wlc_set(wl->wlc, WLC_SET_BCNPRD, info->beacon_int);
WL_UNLOCK(wl);
} }
if (changed & BSS_CHANGED_BSSID) { if (changed & BSS_CHANGED_BSSID) {
/* BSSID changed, for whatever reason (IBSS and managed mode) */ /* BSSID changed, for whatever reason (IBSS and managed mode) */