diff mbox

[v2,1/3] ath6kl: Fix WLAN tethering authentication problem.

Message ID 20160704110719.7694-2-plemagourou@aldebaran.com (mailing list archive)
State Accepted
Commit 270df8f80d67f257d5b3a94d10b899870f39606a
Delegated to: Kalle Valo
Headers show

Commit Message

Pierre Le Magourou July 4, 2016, 11:07 a.m. UTC 
From: Pierre Le Magourou <plemagourou@aldebaran.com>

When enabling WLAN tethering, a new AP is visible and a STA could
connect to it. When the STA tries to authenticate to the newly created
AP, the WPA authentication mechanism is stuck in the 1/4 msg of 4-Way
Handshake.

In ath6kl_rx(), the ath6kl_find_sta() function is looking for the
h_source field of the Ethernet frame header received by the STA. The
datap pointer that points to the Ethernet frame header is incorrect,
and was pointing at the wrong offset in the buffer.

This commit adds a pad_before_data_start offset to set the datap pointer
to the Ethernet frame header. datap->h_source parameter is now really
pointing to the source ethernet address and the authentication process
can continue.

Signed-off-by: Pierre Le Magourou <plemagourou@aldebaran.com>
---
 drivers/net/wireless/ath/ath6kl/txrx.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Kalle Valo July 19, 2016, 1:25 p.m. UTC | #1 
Pierre Le Magourou <lemagoup@gmail.com> wrote:
> From: Pierre Le Magourou <plemagourou@aldebaran.com>
> 
> When enabling WLAN tethering, a new AP is visible and a STA could
> connect to it. When the STA tries to authenticate to the newly created
> AP, the WPA authentication mechanism is stuck in the 1/4 msg of 4-Way
> Handshake.
> 
> In ath6kl_rx(), the ath6kl_find_sta() function is looking for the
> h_source field of the Ethernet frame header received by the STA. The
> datap pointer that points to the Ethernet frame header is incorrect,
> and was pointing at the wrong offset in the buffer.
> 
> This commit adds a pad_before_data_start offset to set the datap pointer
> to the Ethernet frame header. datap->h_source parameter is now really
> pointing to the source ethernet address and the authentication process
> can continue.
> 
> Signed-off-by: Pierre Le Magourou <plemagourou@aldebaran.com>

Thanks, 3 patches applied to ath-next branch of ath.git:

270df8f80d67 ath6kl: Fix WLAN tethering authentication problem.
f3651bae5644 ath6kl: Fix wrong regulatory domain disconnection.
76b817f6c9a9 ath6kl: Unset IFF_LOWER_UP flag on AP mode leave.
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 40432fe..9df41d5 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1401,6 +1401,10 @@  void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
 		return;
 	}
 
+	pad_before_data_start =
+		(le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)
+			& WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;
+
 	/* Get the Power save state of the STA */
 	if (vif->nw_type == AP_NETWORK) {
 		meta_type = wmi_data_hdr_get_meta(dhdr);
@@ -1408,7 +1412,7 @@  void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
 		ps_state = !!((dhdr->info >> WMI_DATA_HDR_PS_SHIFT) &
 			      WMI_DATA_HDR_PS_MASK);
 
-		offset = sizeof(struct wmi_data_hdr);
+		offset = sizeof(struct wmi_data_hdr) + pad_before_data_start;
 		trig_state = !!(le16_to_cpu(dhdr->info3) & WMI_DATA_HDR_TRIG);
 
 		switch (meta_type) {
@@ -1523,9 +1527,6 @@  void ath6kl_rx(struct htc_target *target, struct htc_packet *packet)
 	seq_no = wmi_data_hdr_get_seqno(dhdr);
 	meta_type = wmi_data_hdr_get_meta(dhdr);
 	dot11_hdr = wmi_data_hdr_get_dot11(dhdr);
-	pad_before_data_start =
-		(le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)
-			& WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;
 
 	skb_pull(skb, sizeof(struct wmi_data_hdr));