From nobody Fri Sep 15 14:08:46 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 4RnGJH2KYSz4sV5Y; Fri, 15 Sep 2023 14:08:47 +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 4RnGJH1bm2z4G8T; Fri, 15 Sep 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786927; 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=5xnf5OLDZMC/e3/X4qA8nVwLIaSevBLHJ9zUElPYpVI=; b=wIPC+d1Mlkx6exlPVxw+eibvulkPXwcH7YbzBF+A5cZwI2dTSOd1Q9pv13+WfU8Rqnvxvj t42aLku/X6SLDfUJFMa8oOyUh2KoH/WITqw1zpdb3RBsUgySPMnGf7I96QWvCF2t3HVitv KBwCoyjYg+SF/PMN0/bKLheK370JjGGGGL6RZ7VIWn6qexZ6+uMa2j08EDrvc/VZ7uC4Y4 zL8W+H8j/HjmC4gZ7OIsRZmpmstOehnF4MlvMLLva7NjCE+myQWIptFKgJ3WZ5hbgprz4c Gzaa9hW6cFcBZC2CEsuWzGVgy77vce4AoXYgi7SwCbmX4ZeaV4X/0DM58dx05A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694786927; a=rsa-sha256; cv=none; b=usg4IoEmvUlhDcW5RJZQfyhazJC6jJWFFmqHVK6yk9T32qrJpFdaYHhMnynMk04ufEjkIl 41mRMKMm6V19g2Vyfyhra+55ub1MQlJaqMxCfIV6oNUhkUzK/Zud+1h41XrNXqhurTt+Mz 7MV35Eic9zo7Is7PVvf4y4qTaXUp7L2vAjR/+YCka7ig3jz1a+xdqGJltPGs1l2wlPDmyM 1MSkI6rveI2SthQGngP0bzVP6XRCdFKWvW5P+kwVqu2f76suD3dfvBWrIsSuUXqX/UvMbf orxHqFzYy+KtG3B1xt+XlsHcbitKUoyMLOJDip8ZhDDvehSkSYRJG4CpeCX6AQ== 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=1694786927; 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=5xnf5OLDZMC/e3/X4qA8nVwLIaSevBLHJ9zUElPYpVI=; b=K8M10Tc9rqje6FzxsJV8YNOTjYImkzUm/O2rwEL1YtCPz2uBDBYwyPIoD5O5lkdUTPXhDS DD+GuV6cOgVFbZSalpQ8K6WRRHliXQThzTVVfbRwBDHmIQEQiCaM1swAZC78wcWgcGntMv BP55oygfujI7k/OxDtxSc2fqFbpFMn8zGt5rH9pLqz26dgSVyS0eU0fkihN4D6PuJJ73Xd kHHbULpYvm6sOIqGauo1Z6Q7/OgCBj9nP20Wuaec/f55Tr2tsUu96ae/7tu+byAbfCEhQ0 AEM/aoGY+g2f5cI6bTZe8/gk+etSMVfFmPRPsph51tVaEKzP9nGNYKQVdjYbRQ== 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 4RnGJH0f2lzBS8; Fri, 15 Sep 2023 14:08:47 +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 38FE8kSH090764; Fri, 15 Sep 2023 14:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FE8kmZ090761; Fri, 15 Sep 2023 14:08:46 GMT (envelope-from git) Date: Fri, 15 Sep 2023 14:08:46 GMT Message-Id: <202309151408.38FE8kmZ090761@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: 8ac8e6a2a8d6 - 2023Q3 - net/hostapd-devel: Fix uninitialized packet pointer on error 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: 8ac8e6a2a8d6b2c88ede98f89c7f3b7f7a066c9a Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ac8e6a2a8d6b2c88ede98f89c7f3b7f7a066c9a commit 8ac8e6a2a8d6b2c88ede98f89c7f3b7f7a066c9a Author: Cy Schubert AuthorDate: 2023-09-12 05:17:36 +0000 Commit: Cy Schubert CommitDate: 2023-09-15 14:07:44 +0000 net/hostapd-devel: Fix uninitialized packet pointer on error The packet pointer (called packet) will remain uninitialized when pcap_next_ex() returns an error. This occurs when the wlan interface is shut down using ifconfig destroy. Adding a NULL assignment to packet duplicates what pcap_next() does. The reason we use pcap_next_ex() in this instance is because with pacp_next() when we receive a null pointer if there was an error or if no packets were read. With pcap_next_ex() we can differentiate between an error and legitimately no packets were received. PR: 270649, 273696 Obtained from: src 953efa5b200f Reported by: Robert Morris (cherry picked from commit 2150c312db2fe116e2ce5024645163948334d1e7) --- net/hostapd-devel/Makefile | 2 +- net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile index 5e4a2bf8feea..06df1ba11977 100644 --- a/net/hostapd-devel/Makefile +++ b/net/hostapd-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= hostapd PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMESUFFIX= -devel diff --git a/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c index 26ecb22c808c..224ca67ee95f 100644 --- a/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ ---- src/l2_packet/l2_packet_freebsd.c.orig 2022-03-14 01:42:11.000000000 -0700 -+++ src/l2_packet/l2_packet_freebsd.c 2022-04-14 07:36:24.999713000 -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:12:22.076149000 -0700 @@ -8,7 +8,10 @@ */ @@ -12,7 +12,7 @@ #include #endif /* __APPLE__ */ #include -@@ -76,24 +79,27 @@ +@@ -76,24 +79,28 @@ { struct l2_packet_data *l2 = eloop_ctx; pcap_t *pcap = sock_ctx; @@ -26,6 +26,7 @@ - packet = pcap_next(pcap, &hdr); + if (pcap_next_ex(pcap, &hdr, &packet) == -1) { + wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?"); ++ packet = NULL; + eloop_terminate(); + }