From nobody Fri Sep 15 14:08:42 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RnGJB5M9tz4sV59; Fri, 15 Sep 2023 14:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RnGJB4bX4z4FpC; Fri, 15 Sep 2023 14:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5uCB2Itj7wXPFaJ/CNn0ulFkXWStaVzgQLPkASTu2M=; b=kGg4yp0BCz8wuRdJ5T4Jed2KoAYV5G+6rot90MTyKeerkssZFKFPm8nTeBOzmrP7io2dxF G6x2Lb4Wf8j4+fm1mq25Df59vLRsrM3Cf41w//LJMBeS2K8UUpMO8aFeHvAf7xJAuXgTmR OZ8xvTFfVWbEGcyln/x/waRhvxzuk5VC52m+WTxEkGZmjhTFjNs4zKEtI72BGqtotWm/nV 8ApPelucP5aEb1/qclpyxpnOo5+axmSNEsh6nWrKb+nZgemolcbv64zuGEQZjt8hslxEnX m6K9LStKnJNJB0XuKm2+xrTg6OEAGvRavHKkgqc4tOnD6seVLhlzAbFggoxmAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694786922; a=rsa-sha256; cv=none; b=tWj3QUiS/ZKlkGTvSY+N5IgC82vNCNROndRPRYbfGk0YMqI2M2/N9kk9YlVcqKJ7hy6tcp PgSGm6mUoQcAmdpB+Ix1cZlU57xw0k0X2PFcm6zb5ZeT1q+Crx9k6GIZQ1PT729/tNmOhD AOLXmR3zbG+b1IJlOFGEOBAQI5XW+uNUAZPzy131P548dKdwja54JRqwh2HP07d0XLnRMX LmBNAbTVXOEuJZvoORkosdXBjMpxf2kXpWa2VJryDd07ezX9OUmhVpoxQyvUn9RzPLnCht WUsTM0QxrGCRRagA6pqTv/5EcBZ/KzlOaI0q3m9Lv6MuD6zsHWLbfweJVxYUzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5uCB2Itj7wXPFaJ/CNn0ulFkXWStaVzgQLPkASTu2M=; b=KhVFX+ooVB+JrDliCwes2F5I5I0Mtb7t4v5oGM23G9R/ZOB4S2RtX4ux+ZOD25i41qy9t7 FwKPmGPHMg4ZY8mAPcAeXzhk4ypQHAgWA/jwezPr/e/n0UaBzY10MKXCZrM4H0PnWiNGQW i6zNAPwiJWv6mFkT3QpvbuEGz8uwy3jAWPyh+F83C6m6KkZZeUnQcqAp62FzW3tNA+XwJm iEtX/X3Rsba2zZsBwugpRwgXtGQUWEE/wlHs8TOI79P4zD2jkx5Pauk4qpWCuhxx3/mARs H2/sRbbfKqZJnI8yKnIZb/c8LTA52ML8rBRguDkw4uqnwUeZCcbnaTbbkuJ/2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RnGJB3brczC0f; Fri, 15 Sep 2023 14:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FE8gj4090563; Fri, 15 Sep 2023 14:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FE8ghH090560; Fri, 15 Sep 2023 14:08:42 GMT (envelope-from git) Date: Fri, 15 Sep 2023 14:08:42 GMT Message-Id: <202309151408.38FE8ghH090560@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 7233b4d8b95b - 2023Q3 - security/wpa_supplicant-devel: Reapply c586ac04eb66 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 7233b4d8b95baff0f2f2915a8e93a5df2b6e5c4b Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7233b4d8b95baff0f2f2915a8e93a5df2b6e5c4b commit 7233b4d8b95baff0f2f2915a8e93a5df2b6e5c4b Author: Cy Schubert AuthorDate: 2023-09-12 05:08:11 +0000 Commit: Cy Schubert CommitDate: 2023-09-15 14:07:43 +0000 security/wpa_supplicant-devel: Reapply c586ac04eb66 Reapply "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, 273696 Obtained from: src 6e5d01124fd4 Reported by: Damjan Jovanovic , bz (privately) (cherry picked from commit 5da13f40eeaa4b39b3a9fd41e58d082e954acce6) --- security/wpa_supplicant-devel/Makefile | 2 +- .../files/patch-src_l2__packet_l2__packet__freebsd.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile index 7fc017f967bf..d28ed3db5b82 100644 --- a/security/wpa_supplicant-devel/Makefile +++ b/security/wpa_supplicant-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net PKGNAMESUFFIX= -devel diff --git a/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c b/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c index e256ee3860e1..62365bdc9900 100644 --- a/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/security/wpa_supplicant-devel/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ ---- src/l2_packet/l2_packet_freebsd.c.orig 2022-01-16 12:51:29.000000000 -0800 -+++ src/l2_packet/l2_packet_freebsd.c 2022-04-14 07:23:26.534960000 -0700 +--- src/l2_packet/l2_packet_freebsd.c.orig 2023-09-05 10:38:47.000000000 -0700 ++++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:06:24.154851000 -0700 @@ -8,7 +8,10 @@ */ @@ -12,3 +12,15 @@ #include #endif /* __APPLE__ */ #include +@@ -82,7 +85,10 @@ + 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;