diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 55c065403..380fb8d73 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -211,6 +211,8 @@ void handle_probe_req(struct hostapd_data *hapd,
 	size_t i;
 
 	ie = mgmt->u.probe_req.variable;
+	if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
+		return;
 	ie_len = len - (IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req));
 
 	for (i = 0; hapd->probereq_cb && i < hapd->num_probereq_cb; i++)
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 94898cc9f..f65b79e30 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -1460,6 +1460,9 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
 	int broadcast;
 	u16 fc, stype;
 
+	if (len < 24)
+		return;
+
 	mgmt = (struct ieee80211_mgmt *) buf;
 	fc = le_to_host16(mgmt->frame_control);
 	stype = WLAN_FC_GET_STYPE(fc);