DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix a bug with ap_rx_from_unknown_sta() recursion

Browse source 
ap_rx_from_unknown_sta was going into infinite recursion,
or could even crash because of corrupted pointer cast.
This commit is contained in:
Witold Sowa 2009-08-26 20:18:24 +03:00 committed by Jouni Malinen
parent 335ce76b1c
commit 3a57305f10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/driver_nl80211.c
View file

@ -2588,7 +2588,7 @@ static int nl80211_create_iface(struct wpa_driver_nl80211_data *drv,
void ap_tx_status(void *ctx, const u8 *addr, void ap_tx_status(void *ctx, const u8 *addr,
const u8 *buf, size_t len, int ack); const u8 *buf, size_t len, int ack);
void ap_rx_from_unknown_sta(void *ctx, const u8 *addr); void ap_rx_from_unknown_sta(void *ctx, struct ieee80211_hdr *hdr, size_t len);
void ap_mgmt_rx(void *ctx, u8 *buf, size_t len, u16 stype, void ap_mgmt_rx(void *ctx, u8 *buf, size_t len, u16 stype,
struct hostapd_frame_info *fi); struct hostapd_frame_info *fi);
void ap_mgmt_tx_cb(void *ctx, u8 *buf, size_t len, u16 stype, int ok); void ap_mgmt_tx_cb(void *ctx, u8 *buf, size_t len, u16 stype, int ok);
@ -2643,7 +2643,7 @@ static void from_unknown_sta(struct wpa_driver_nl80211_data *drv,
#ifdef HOSTAPD #ifdef HOSTAPD
hostapd_rx_from_unknown_sta(drv->ctx, hdr, len); hostapd_rx_from_unknown_sta(drv->ctx, hdr, len);
#else /* HOSTAPD */ #else /* HOSTAPD */
ap_rx_from_unknown_sta(drv->ctx, hdr->addr2); ap_rx_from_unknown_sta(drv->ctx, hdr, len);
#endif /* HOSTAPD */ #endif /* HOSTAPD */
} }

4
wpa_supplicant/ap.c
View file

@ -494,10 +494,10 @@ void ap_tx_status(void *ctx, const u8 *addr,
} }
void ap_rx_from_unknown_sta(void *ctx, const u8 *addr) void ap_rx_from_unknown_sta(void *ctx, struct ieee80211_hdr *hdr, size_t len)
{ {
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
ap_rx_from_unknown_sta(wpa_s->ap_iface->bss[0], addr); hostapd_rx_from_unknown_sta(wpa_s->ap_iface->bss[0], hdr, len);
} }