From nobody Tue Sep 12 05:53:07 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 4RlCRm0c1bz4sYJK; Tue, 12 Sep 2023 05:53:08 +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 4RlCRm02lsz3dGy; Tue, 12 Sep 2023 05:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694497988; 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=i3wqvrOTQN+qfeAuxAcaD5ViKv/k7W9tPvUcCcYvs5w=; b=l6GMZ19rtAA9yzII9NBs7OqkP++PkKs62bDcH+yKBsv0v1SeLX39EY4EqKPJB811VxfGKb KtdTVEZOFnHHv9wRsFVmnEEhnWVSWVdbefuL2VvUEOZ/wvUX2NBT2p3CqBahu9ViCFlZ2G xy8t0TXzxGiHz1AmJsXSKT6MMWy7vBjLkC2E7GnZO5K//7A16byFH8uQ2fynOFzD4DDQfY auFeoe/gyCJtLn/TAsbyLGGf8YmCoIhkrTq+C9noB3plU2TY0knkIdqxlaSQbTPVEZOZXV tSk1EscChTKMWVDC6gD8OKt8RFWJ69xEm0JKP6IWQKS2KFg85AYTTndGVSi+2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694497988; a=rsa-sha256; cv=none; b=nUqArPZkhalpvUxW5J1Wv659rFnJIfW2oQLhuXAR8mmZC5pB3Ub3PdRtcGrxTZuXOPE0WX bIlMFnyn6Ayf99Mog9Gr4PWC+qlpJtTLZc0z6C929xzYR/QgWIpf4g17SUQGX61p6CQfNp Df3xzhqM8vx0+ZPRCLMqffM6qzTNJy9GAbcWK+iE68hlNkOOIjGqLdpIQltZo6dL8GEjAT vshxasxtttyAwBeHB3hum1VadsfYtahEuvAOaFJKturQAMUFBTDFV14C+RC1rVDXnzhRVd BGe7UfNckL9FfORaYtjdUB8ehHeJ2yTP0bYxAk1c3uXAvXMtrT8+I6h4NjX1sw== 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=1694497988; 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=i3wqvrOTQN+qfeAuxAcaD5ViKv/k7W9tPvUcCcYvs5w=; b=eIWRTXgKGXy/gidheygkgd2FzIc8uh0HdPC2Wx5dGQHrBNsg/B63ORWCuqxt3Vw/yyD9f4 GmBXjCXY75JreCXZiu8ULtxhiGEF4PJCQTvW+Vv7QPKkoKlPiLpEgSdRhUl6aVADIZF54V Rpclb7Sg8t3uEpxvCG6AVHrpsCEV0VMvNk3YsupJNu17KpMm4qdFJy8r53FvUMu9z47jAo 1cl3eacqrIEPEFpPm/d04shjM3g+2ySeQlzknItt7aSMREkr/CvGpz1T++cBD20PvyONCW 9rggQ/BGQ6jkur5PACfjXYPBbDMc1Ao1YCfqj0GsfwY+exQuKadAwngPeC0m4A== 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 4RlCRl5pmFz5dP; Tue, 12 Sep 2023 05:53:07 +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 38C5r76b086721; Tue, 12 Sep 2023 05:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C5r7FX086719; Tue, 12 Sep 2023 05:53:07 GMT (envelope-from git) Date: Tue, 12 Sep 2023 05:53:07 GMT Message-Id: <202309120553.38C5r7FX086719@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 89484a70b0d2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 89484a70b0d26f483df30e43945b22a0df1be941 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=89484a70b0d26f483df30e43945b22a0df1be941 commit 89484a70b0d26f483df30e43945b22a0df1be941 Author: Cy Schubert AuthorDate: 2023-09-12 05:15:41 +0000 Commit: Cy Schubert CommitDate: 2023-09-12 05:51:10 +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 MFH: 2023Q3 --- 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(); + }