Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2975edc authored by Yeshwanth Sriram Guntuka's avatar Yeshwanth Sriram Guntuka Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Drop non-EAPOL/WAPI frames from unauthorized peer 

Drop non-EAPOL/WAPI frames from unauthorized peer received
in the IPA exception path.

Change-Id: I0c0bc6e60efa193126ba1e3eca36c5e02f7f76a3
CRs-Fixed: 2860206
parent 1c271440

components/ipa/core/inc/wlan_ipa_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ struct wlan_ipa_priv; 
 * @interface_lock: Interface lock

 * @ifa_address: Interface address

 * @stats: Interface stats

 * @bssid: BSSID. valid only for sta iface ctx;

 */

struct wlan_ipa_iface_context {

	struct wlan_ipa_priv *ipa_ctx;
@@ -334,6 +335,7 @@ struct wlan_ipa_iface_context { 
	qdf_spinlock_t interface_lock;

	uint32_t ifa_address;

	struct wlan_ipa_iface_stats stats;

	struct qdf_mac_addr bssid;

};



/**

components/ipa/core/src/wlan_ipa_core.c

+43 −0
Original line number Diff line number Diff line
@@ -988,6 +988,8 @@ static void __wlan_ipa_w2i_cb(void *priv, qdf_ipa_dp_evt_type_t evt, 
	uint8_t iface_id;

	uint8_t session_id = 0xff;

	struct wlan_ipa_iface_context *iface_context;

	bool is_eapol_wapi = false;

	struct qdf_mac_addr peer_mac_addr = QDF_MAC_ADDR_ZERO_INIT;



	ipa_ctx = (struct wlan_ipa_priv *)priv;

	if (!ipa_ctx) {
@@ -1037,6 +1039,34 @@ static void __wlan_ipa_w2i_cb(void *priv, qdf_ipa_dp_evt_type_t evt, 
		}

		iface_context->stats.num_rx_ipa_excep++;



		if (iface_context->device_mode == QDF_STA_MODE)

			qdf_copy_macaddr(&peer_mac_addr, &iface_context->bssid);

		else if (iface_context->device_mode == QDF_SAP_MODE)

			qdf_mem_copy(&peer_mac_addr.bytes[0],

				     qdf_nbuf_data(skb) +

				     QDF_NBUF_SRC_MAC_OFFSET,

				     QDF_MAC_ADDR_SIZE);



		if (qdf_nbuf_is_ipv4_eapol_pkt(skb) ||

		    qdf_nbuf_is_ipv4_wapi_pkt(skb))

			is_eapol_wapi = true;



		/*

		 * Check for peer authorized state before allowing

		 * non-EAPOL/WAPI frames to be intrabss forwarded

		 * or submitted to stack.

		 */

		if (cdp_peer_state_get(ipa_ctx->dp_soc,

				       iface_context->session_id,

				       &peer_mac_addr.bytes[0]) !=

		    OL_TXRX_PEER_STATE_AUTH && !is_eapol_wapi) {

			ipa_err_rl("Non EAPOL/WAPI packet received when peer "QDF_MAC_ADDR_FMT" is unauthorized",

				   QDF_MAC_ADDR_REF(peer_mac_addr.bytes));

			ipa_ctx->ipa_rx_internal_drop_count++;

			dev_kfree_skb_any(skb);

			return;

		}



		/* Disable to forward Intra-BSS Rx packets when

		 * ap_isolate=1 in hostapd.conf

		 */
@@ -1467,6 +1497,7 @@ static void wlan_ipa_cleanup_iface(struct wlan_ipa_iface_context *iface_context) 
	iface_context->session_id = WLAN_IPA_MAX_SESSION;

	qdf_spin_unlock_bh(&iface_context->interface_lock);

	iface_context->ifa_address = 0;

	qdf_zero_macaddr(&iface_context->bssid);

	if (!iface_context->ipa_ctx->num_iface) {

		ipa_err("NUM INTF 0, Invalid");

		QDF_ASSERT(0);
@@ -2029,6 +2060,14 @@ void wlan_ipa_handle_multiple_sap_evt(struct wlan_ipa_priv *ipa_ctx, 
}

#endif



static inline void

wlan_ipa_save_bssid_iface_ctx(struct wlan_ipa_priv *ipa_ctx, uint8_t iface_id,

			      uint8_t *mac_addr)

{

	qdf_mem_copy(ipa_ctx->iface_context[iface_id].bssid.bytes,

		     mac_addr, QDF_MAC_ADDR_SIZE);

}



/**

 * __wlan_ipa_wlan_evt() - IPA event handler

 * @net_dev: Interface net device
@@ -2230,6 +2269,10 @@ static QDF_STATUS __wlan_ipa_wlan_evt(qdf_netdev_t net_dev, uint8_t device_mode, 
		ipa_ctx->vdev_to_iface[session_id] =

				wlan_ipa_get_ifaceid(ipa_ctx, session_id);



		wlan_ipa_save_bssid_iface_ctx(ipa_ctx,

					     ipa_ctx->vdev_to_iface[session_id],

					     mac_addr);



		if (wlan_ipa_uc_sta_is_enabled(ipa_ctx->config) &&

		    (ipa_ctx->sap_num_connected_sta > 0 ||

		     wlan_ipa_is_sta_only_offload_enabled()) &&