diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2016-12-20 03:38:12 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-12-21 15:34:16 +0100 |
| commit | 22b68b93ae2506bd56ee3bf232a51bc8ab955b56 (patch) | |
| tree | 2ba3e4c4dcf4f1d7aeaf919d21c4b7afb824cba6 /drivers | |
| parent | ath9k: do not return early to fix rcu unlocking (diff) | |
| download | linux-22b68b93ae2506bd56ee3bf232a51bc8ab955b56.tar.xz linux-22b68b93ae2506bd56ee3bf232a51bc8ab955b56.zip | |
rtlwifi: Fix kernel oops introduced with commit e49656147359
With commit e49656147359 {"rtlwifi: Use dev_kfree_skb_irq instead of
kfree_skb"), the method used to free an skb was changed because the
kfree_skb() was inside a spinlock. What was forgotten is that kfree_skb()
guards against a NULL value for the argument. Routine dev_kfree_skb_irq()
does not, and a test is needed to prevent kernel panics.
Fixes: e49656147359 ("rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb")
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> # 4.9+
Cc: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index 2caa4ad04dba..ded1493fee9c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -1829,7 +1829,8 @@ bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb) spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags); pskb = __skb_dequeue(&ring->queue); - dev_kfree_skb_irq(pskb); + if (pskb) + dev_kfree_skb_irq(pskb); /*this is wrong, fill_tx_cmddesc needs update*/ pdesc = &ring->desc[0]; |