iwl4965: fix skb usage after free

Since

commit a120e912eb51e347f36c71b60a1d13af74d30e83
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Fri Feb 19 15:47:33 2010 -0800

iwlwifi: sanity check before counting number of tfds can be free

we use skb->data after calling ieee80211_tx_status_irqsafe(), which
could free skb instantly.

On current kernels I do not observe practical problems related with
bug, but on 2.6.35.y it cause random system hangs when stressing
wireless link, making bisection of other problems impossible.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by Stanislaw Gruszka and committed by John W. Linville 069f40fc b2502698

+7 -3
+7 -3
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
··· 1127 1127 q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd)) { 1128 1128 1129 1129 tx_info = &txq->txb[txq->q.read_ptr]; 1130 - iwl4965_tx_status(priv, tx_info, 1131 - txq_id >= IWL4965_FIRST_AMPDU_QUEUE); 1130 + 1131 + if (WARN_ON_ONCE(tx_info->skb == NULL)) 1132 + continue; 1132 1133 1133 1134 hdr = (struct ieee80211_hdr *)tx_info->skb->data; 1134 - if (hdr && ieee80211_is_data_qos(hdr->frame_control)) 1135 + if (ieee80211_is_data_qos(hdr->frame_control)) 1135 1136 nfreed++; 1137 + 1138 + iwl4965_tx_status(priv, tx_info, 1139 + txq_id >= IWL4965_FIRST_AMPDU_QUEUE); 1136 1140 tx_info->skb = NULL; 1137 1141 1138 1142 priv->cfg->ops->lib->txq_free_tfd(priv, txq);