openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: [BUG] Protect MACvSelectPage1 with lock. 

The device must not flip to page 1 while in interrupt lock causing
loss of connection or dead lock.

Protect from changes to page by adding lock where user can
change the page in CARDvSetRSPINF, vnt_configure and set_channel

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2015-01-11 10:26:12 +00:00 committed by Greg Kroah-Hartman
parent bc22b4978d
commit 95775d1221
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/vt6655/card.c
View File

@ -670,6 +670,9 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, u8 bb_type)
{ {
union vnt_phy_field_swap phy; union vnt_phy_field_swap phy;
unsigned char byTxRate, byRsvTime; /* For OFDM */ unsigned char byTxRate, byRsvTime; /* For OFDM */
unsigned long flags;
spin_lock_irqsave(&pDevice->lock, flags);
/* Set to Page1 */ /* Set to Page1 */
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
@ -767,6 +770,8 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, u8 bb_type)
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime));
/* Set to Page0 */ /* Set to Page0 */
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
spin_unlock_irqrestore(&pDevice->lock, flags);
} }
void CARDvUpdateBasicTopRate(struct vnt_private *pDevice) void CARDvUpdateBasicTopRate(struct vnt_private *pDevice)

6
drivers/staging/vt6655/channel.c
View File

@ -202,6 +202,10 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
BBvSoftwareReset(pDevice); BBvSoftwareReset(pDevice);
if (pDevice->byLocalID > REV_ID_VT3253_B1) { if (pDevice->byLocalID > REV_ID_VT3253_B1) {
unsigned long flags;
spin_lock_irqsave(&pDevice->lock, flags);
/* set HW default power register */ /* set HW default power register */
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh); RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);
@ -209,6 +213,8 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh); RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);
VNSvOutPortB(pDevice->PortOffset + MAC_REG_PWROFDM, pDevice->byCurPwr); VNSvOutPortB(pDevice->PortOffset + MAC_REG_PWROFDM, pDevice->byCurPwr);
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
spin_unlock_irqrestore(&pDevice->lock, flags);
} }
if (pDevice->byBBType == BB_TYPE_11B) if (pDevice->byBBType == BB_TYPE_11B)

6
drivers/staging/vt6655/device_main.c
View File

@ -1565,6 +1565,10 @@ static void vnt_configure(struct ieee80211_hw *hw,
if (changed_flags & FIF_ALLMULTI) { if (changed_flags & FIF_ALLMULTI) {
if (*total_flags & FIF_ALLMULTI) { if (*total_flags & FIF_ALLMULTI) {
unsigned long flags;
spin_lock_irqsave(&priv->lock, flags);
if (priv->mc_list_count > 2) { if (priv->mc_list_count > 2) {
MACvSelectPage1(priv->PortOffset); MACvSelectPage1(priv->PortOffset);
@ -1586,6 +1590,8 @@ static void vnt_configure(struct ieee80211_hw *hw,
MACvSelectPage0(priv->PortOffset); MACvSelectPage0(priv->PortOffset);
} }
spin_unlock_irqrestore(&priv->lock, flags);
rx_mode |= RCR_MULTICAST | RCR_BROADCAST; rx_mode |= RCR_MULTICAST | RCR_BROADCAST;
} else { } else {
rx_mode &= ~(RCR_MULTICAST | RCR_BROADCAST); rx_mode &= ~(RCR_MULTICAST | RCR_BROADCAST);