From nobody Fri Sep 15 14:08:43 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 4RnGJD0lfLz4sTn0; Fri, 15 Sep 2023 14:08:44 +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 4RnGJC5pjNz4Fn6; Fri, 15 Sep 2023 14:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786923; 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=NfxlIzLaF3D+G8/Q5fwgHpUozFD4DmhkG+00ViqckT8=; b=KKyytVohrjUY1xBR+cm+0zCgQKcNuh/ezZgc5z79M3PJutsAWIyyq0vMFCbC4WezoqvHt4 C6UbWUxYC8kzAmVf9jU3N7UL9HPRCalumsEBruZNaz4ASgYTN/h4gqehNGZ6qW4PK7yQRm 7B/R99Xn0M4npe/tDP6P7ZsaiIurVPTfV/KCFx9nrEw6KxANHR2chYCumBM+e+4jkHKj3f kV4raKufAx8rCZDbpTLT8fKDiQa7+4yjlLn/HDWFwiuqWxMbieuUjWICXEG0Raxu+8Hf8z 3041JrA46r7Rq2Ma8qP2iMOK54H/QCDaaJe5IwaF6N3HdtoesVSPMcn2hBo0Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694786923; a=rsa-sha256; cv=none; b=Iu9QtWuq2ym6BSxtPIaybI8cUyAcDPOXA8xlgjlqXB2Xgvwyt78HAm/HsXW+Sgijv2WeCE Pc3ZFxa8Y9QLEbB80jePhbDG74ZbNPByJxFeEsOykRva6OeI1PPMhS4dn+KLW1HMtrXCVw LXnqoUBLkbrBzbPfmLE9RIWktkGq00h/dr0x/CGRMmnoixpx1rX5LCvo9McAOPZQFJz8jS 2rCnkB08V/gQw7sqbddJNZoJHyOJTvIPKLba3sBZpbfz0C6eZJ4mlJ1Meg08R0YftogjUW X+sPZN8ERxzwrglxqq54zOofNrIUeW7tggrPvL0DytHqNuBXqGpzmpIQY8Gxcw== 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=1694786923; 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=NfxlIzLaF3D+G8/Q5fwgHpUozFD4DmhkG+00ViqckT8=; b=gBZVIyuTDwDgorapZOHPUNcqMecO0iiP8d9lNyTvGN8CACNhjntzAXIgH9WTwRRBN85qwv 95lAhUFWWIE1piDkOsTvNajfZ902wYq0t8W550KSbKDAErO3pZpZwzjxu6PjyfjGVrQtFB 6Z5xrDDmXzcSEz5yAauVRDcNB0Jq0jJc3ADjxbQ3DZGeQr6e4qSCxc0b+YsxTjkcrhwrgZ 1UFPm0Hp0zf0oSvGkbFYiitmc8op11fG1x8TaN6O9cVRJnPpp31q7oPPKWx/NgUkBBr1bh PyDSNHH1bHDIJ7OUHYrEOkTnKFIq0NfzWm66tAV0hOTXdkc8P06mObVaFkyp6w== 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 4RnGJC4cqVzBqk; Fri, 15 Sep 2023 14:08:43 +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 38FE8hwO090618; Fri, 15 Sep 2023 14:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FE8hLp090615; Fri, 15 Sep 2023 14:08:43 GMT (envelope-from git) Date: Fri, 15 Sep 2023 14:08:43 GMT Message-Id: <202309151408.38FE8hLp090615@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: 45703ac1172c - 2023Q3 - security/wpa_supplicant: 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: 45703ac1172cc56d8f2b3bebf57309c87b7ee85f Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=45703ac1172cc56d8f2b3bebf57309c87b7ee85f commit 45703ac1172cc56d8f2b3bebf57309c87b7ee85f Author: Cy Schubert AuthorDate: 2023-09-12 05:15:41 +0000 Commit: Cy Schubert CommitDate: 2023-09-15 14:07:43 +0000 security/wpa_supplicant: 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 89484a70b0d26f483df30e43945b22a0df1be941) --- security/wpa_supplicant/Makefile | 2 +- .../wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile index 9319bb55675e..4c39d4748128 100644 --- a/security/wpa_supplicant/Makefile +++ b/security/wpa_supplicant/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant PORTVERSION= 2.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security net MASTER_SITES= https://w1.fi/releases/ diff --git a/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c b/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c index 5a55ec96fc90..19f47461772f 100644 --- a/security/wpa_supplicant/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/security/wpa_supplicant/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:21:15.259934000 -0700 ++++ src/l2_packet/l2_packet_freebsd.c 2023-09-10 23:29:49.674128000 -0700 @@ -8,7 +8,8 @@ */ @@ -10,7 +10,7 @@ #include #endif /* __APPLE__ */ #include -@@ -76,24 +77,27 @@ +@@ -76,24 +77,28 @@ { struct l2_packet_data *l2 = eloop_ctx; pcap_t *pcap = sock_ctx; @@ -24,6 +24,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(); + }