Skip to content

Commit 390fd9d

Browse files
chunkeeylinvjw
authored andcommitted
p54: fix off-by-one null pointer bug in p54_tx_80211
This patch fixes a regression which was introduced in: "mac80211: move TX station pointer and restructure TX" IP: p54_tx_80211+0x21/0x513 [p54common] Oops: 0000 [#1] SMP Modules linked in: p54usb p54common [...] Pid: 13394, comm: hostapd 3.6.0-rc4-wl+ RIP: 0010:p54_tx_80211+0x21/0x513 RSP: 0018:... EFLAGS: 00010292 [...] Process hostapd Stack: [...] Call Trace: p54_bss_info_changed+0x204/0x21e [p54common] ieee80211_del_station+0x16/0x32 [mac80211] ieee80211_start_ap+0x10f/0x157 [mac80211] nl80211_start_ap+0x315/0x361 [cfg80211] p54_tx_80211 function is called as part of the beacon update. The caller p54_bss_info_changed has to supply a valid tx control struct, or the control->sta will lead to a null pointer dereference. Signed-off-by: Christian Lamparter <[email protected]> Signed-off-by: John W. Linville <[email protected]>
1 parent 28ab58b commit 390fd9d

File tree

1 file changed

+2
-1
lines changed
  • drivers/net/wireless/p54

1 file changed

+2
-1
lines changed

drivers/net/wireless/p54/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ static int p54_beacon_format_ie_tim(struct sk_buff *skb)
139139
static int p54_beacon_update(struct p54_common *priv,
140140
struct ieee80211_vif *vif)
141141
{
142+
struct ieee80211_tx_control control = { };
142143
struct sk_buff *beacon;
143144
int ret;
144145

@@ -158,7 +159,7 @@ static int p54_beacon_update(struct p54_common *priv,
158159
* to cancel the old beacon template by hand, instead the firmware
159160
* will release the previous one through the feedback mechanism.
160161
*/
161-
p54_tx_80211(priv->hw, NULL, beacon);
162+
p54_tx_80211(priv->hw, &control, beacon);
162163
priv->tsf_high32 = 0;
163164
priv->tsf_low32 = 0;
164165

0 commit comments

Comments
 (0)