diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2022-04-03 03:54:50 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2022-04-07 21:20:35 +0000 |
| commit | 2010c5e3a379c55d188909dcc6c0edb12272983b (patch) | |
| tree | 9a17cde764fd94b608e6a831fbd3fa007c48943c | |
| parent | 8f89382e0fd6346c43a0b149462f52d87f40f818 (diff) | |
| download | src-2010c5e3a379c55d188909dcc6c0edb12272983b.tar.gz src-2010c5e3a379c55d188909dcc6c0edb12272983b.zip | |
wpa/hostapd: Fix 100% CPU when USB wlan NIC removed
hostapd calls pcap_next(3) to read the next packet off the wlan interface.
pcap_next() returns a pointer to the packet header but does not indicate
success or failure. Unfortunately this results in an infinite loop (100%
CPU) when the wlan device disappears, i.e. when a USB wlan device is
manually removed or a USB error results in the device removal. However
pcap_next_ex(3) does return success or failure. To resolve this we use
pcap_next_ex(), forcing hostapd to exit when the error is encountered.
An error message is printed to syslog or stderr when debugging (-d flag)
is enabled. Unfortunately wpa_printf() only works when debugging is enabled.
PR: 253608
Reported by: Damjan Jovanovic <damjan.jov@gmail.com>,
bz (privately)
(cherry picked from commit 6e5d01124fd4dd57899ddd9260c76dbb43543aa7)
| -rw-r--r-- | contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c index 48e18fffba57..da742f432120 100644 --- a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c +++ b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c @@ -83,7 +83,10 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx) unsigned char *buf; size_t len; - packet = pcap_next(pcap, &hdr); + if (pcap_next_ex(pcap, &hdr, &packet) == -1) { + wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?"); + eloop_terminate(); + } if (!l2->rx_callback || !packet || hdr.caplen < sizeof(*ethhdr)) return; |