[PATCH v2 02/11] nl80211: differentiate between ETH_P_PAE and ETH_P_RSN_PREAUTH for control port rx

nl80211 control port event handling currently does not differentiate
between EAPOL and PREAUTH frames. This patch adds this and checks if
unwanted pre-auth frames are received indicating a misconfiguration or bug.

Signed-off-by: Markus Theil <[email protected]>
---
 src/drivers/driver_nl80211_event.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index d4ca2eb29..f612d6397 100644
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -2505,12 +2505,26 @@ static void nl80211_sta_opmode_change_event(struct wpa_driver_nl80211_data *drv,
 static void nl80211_control_port_frame(struct wpa_driver_nl80211_data *drv,
 				       struct nlattr **tb)
 {
-	if (!tb[NL80211_ATTR_MAC] || !tb[NL80211_ATTR_FRAME])
+	u8 *src_addr = NULL;
+
+	if (!tb[NL80211_ATTR_MAC] ||
+	    !tb[NL80211_ATTR_FRAME] ||
+	    !tb[NL80211_ATTR_CONTROL_PORT_ETHERTYPE])
 		return;
 
-	drv_event_eapol_rx(drv->ctx, nla_data(tb[NL80211_ATTR_MAC]),
-			   nla_data(tb[NL80211_ATTR_FRAME]),
-			   nla_len(tb[NL80211_ATTR_FRAME]));
+	src_addr = nla_data(tb[NL80211_ATTR_MAC]);
+
+	switch(nla_get_u16(tb[NL80211_ATTR_CONTROL_PORT_ETHERTYPE])) {
+	case ETH_P_RSN_PREAUTH:
+		wpa_printf(MSG_WARNING, "nl80211: Got pre-auth frame from " MACSTR " over nl80211 control port this should not happen!", 
+			   MAC2STR(src_addr));
+		break;
+	case ETH_P_PAE:
+		drv_event_eapol_rx(drv->ctx, src_addr,
+				   nla_data(tb[NL80211_ATTR_FRAME]),
+				   nla_len(tb[NL80211_ATTR_FRAME]));
+		break;
+	}
 }
 
 
-- 
2.26.0