]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: brcm80211: bugfix for control.sta NULL ptr dereference
authorRoland Vossen <rvossen@broadcom.com>
Thu, 10 Mar 2011 10:35:07 +0000 (11:35 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Mar 2011 18:44:02 +0000 (11:44 -0700)
Mac80211 can transmit packets where the control.sta field is NULL.
The driver dereferenced this. Bugfix was to only dereference a non NULL
ieee80211_sta pointer.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/wlc_main.c

index cb1e1428cd87ac13a57afb4fc81596e8ef6e9bde..8bee149f6316814aa5176ae744a4deef0ce93985 100644 (file)
@@ -6613,7 +6613,8 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
        tx_info = IEEE80211_SKB_CB(p);
        h = (struct ieee80211_hdr *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
 
-       scb = (struct scb *)tx_info->control.sta->drv_priv;
+       if (tx_info->control.sta)
+               scb = (struct scb *)tx_info->control.sta->drv_priv;
 
        if (N_ENAB(wlc->pub)) {
                u8 *plcp = (u8 *) (txh + 1);