diff mbox

[V4.2] rtlwifi: Fix NULL dereference when PCI driver used as an AP

Message ID 1438222280-4146-1-git-send-email-Larry.Finger@lwfinger.net
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Larry Finger July 30, 2015, 2:11 a.m. UTC 
From: Luis Felipe Dominguez Vega <lfdominguez@nauta.cu>

In commit 33511b157bbcebaef853cc1811992b664a2e5862 ("rtlwifi: add support to
send beacon frame"), the mechanism for sending beacons was established. That
patch works correctly for rtl8192cu, but there is a possibility of getting
the following warnings in the PCI drivers:

WARNING: CPU: 1 PID: 2439 at net/mac80211/driver-ops.h:12
ieee80211_bss_info_change_notify+0x179/0x1d0 [mac80211]()
wlp5s0:  Failed check-sdata-in-driver check, flags: 0x0

The warning is followed by a NULL pointer dereference as follows:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000006
IP: [<ffffffffc073998e>] rtl_get_tcb_desc+0x5e/0x760 [rtlwifi]

This problem was reported at http://thread.gmane.org/gmane.linux.kernel.wireless.general/138645,
but no solution was found at that time.

The problem was also reported at https://bugzilla.kernel.org/show_bug.cgi?id=9744
and this solution was developed and tested there.

The USB driver works with a NULL final argument in the adapter_tx() callback;
however, the PCI drivers need a struct rtl_tcb_desc in that position.

Signed-off-by: Luis Felipe Dominguez Vega <lfdominguez@nauta.cu>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> [3.19+]
---

Kalle,

I have marked this fix for V4.2, and I hope it will make it.

Thanks,

Larry
---
 drivers/net/wireless/rtlwifi/core.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Kalle Valo July 31, 2015, 6:26 a.m. UTC | #1 
> From: Luis Felipe Dominguez Vega <lfdominguez@nauta.cu>
> 
> In commit 33511b157bbcebaef853cc1811992b664a2e5862 ("rtlwifi: add support to
> send beacon frame"), the mechanism for sending beacons was established. That
> patch works correctly for rtl8192cu, but there is a possibility of getting
> the following warnings in the PCI drivers:
> 
> WARNING: CPU: 1 PID: 2439 at net/mac80211/driver-ops.h:12
> ieee80211_bss_info_change_notify+0x179/0x1d0 [mac80211]()
> wlp5s0:  Failed check-sdata-in-driver check, flags: 0x0
> 
> The warning is followed by a NULL pointer dereference as follows:
> 
> BUG: unable to handle kernel NULL pointer dereference at 0000000000000006
> IP: [<ffffffffc073998e>] rtl_get_tcb_desc+0x5e/0x760 [rtlwifi]
> 
> This problem was reported at http://thread.gmane.org/gmane.linux.kernel.wireless.general/138645,
> but no solution was found at that time.
> 
> The problem was also reported at https://bugzilla.kernel.org/show_bug.cgi?id=9744
> and this solution was developed and tested there.
> 
> The USB driver works with a NULL final argument in the adapter_tx() callback;
> however, the PCI drivers need a struct rtl_tcb_desc in that position.
> 
> Fixes: 33511b157bbc ("rtlwifi: add support to send beacon frame.")
> Signed-off-by: Luis Felipe Dominguez Vega <lfdominguez@nauta.cu>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Stable <stable@vger.kernel.org> [3.19+]

Thanks, applied to wireless-drivers.git.

But I added Fixes line to make it clear what commit this fixes.

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 3b3a88b..585d088 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -1015,9 +1015,12 @@  static void send_beacon_frame(struct ieee80211_hw *hw,
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct sk_buff *skb = ieee80211_beacon_get(hw, vif);
+	struct rtl_tcb_desc tcb_desc;
 
-	if (skb)
-		rtlpriv->intf_ops->adapter_tx(hw, NULL, skb, NULL);
+	if (skb) {
+		memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
+		rtlpriv->intf_ops->adapter_tx(hw, NULL, skb, &tcb_desc);
+	}
 }
 
 static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,