From nobody Sun Apr 09 03:54:14 2023 X-Original-To: dev-commits-src-branches@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 4PvJBc02tPz43Wx3; Sun, 9 Apr 2023 03:54:16 +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 4PvJBb0Kh5z47d5; Sun, 9 Apr 2023 03:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681012455; 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=xq66z1jGTN0Uv+DUE7CyCEqDvBT3fM9Px1bokIsiIo8=; b=roaqAePV/WondsI9kpSWiZ2NipaXPPH2TLKuMY/tGAhL39AfM6PRzqkW1H20fzHr0okILn MyQrkMBm0E+yUtsUYn8V0lnTtWzwFhXZvlRCdapFRpr0wXpG1XOOmfrfBcIzvh1TmkkaSL Ukxo4DFCLzX0CM0UFnbAEKv9tXZ2uj2m7ZkUOqeEVfbhUpZJPF3hA9OEpGvjWHbpujegDN l16O/2GSjzps7nAGdEiK/oDya+NGzDo30/YZywyzXEnFjBN9QOYmtfR0nzbDqlJjQlMzbC D4qFE2gPozBwozEXFL+OUxbgiv01rYyMHHrackf8iBVo9RZBDgxzIgX7VzsdKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681012455; 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=xq66z1jGTN0Uv+DUE7CyCEqDvBT3fM9Px1bokIsiIo8=; b=oyATFX7bQKB8rFb9Et1tIt8RcZskqNAQ9psN0jotLG4UBDqRNsQdnsWoCUW7Zvlyo8Q+hv RHyUiNfKjd+GDciR7r/DmtWXdEZRFjmybRak2QD62FBlTSvUqcaymvSZZj74U5e1zHZo/e QSJSny6evbnVqE8lPRzds1CSiur6W3VEkCF5yvkAgZ/jlT6tItgORe4GeVosNXlxBkjb0f RokNznGRDR92rFgaoCcJTO38fINm52PcZuWPV/ViL2WpW4afR9pNLZRKgJAkXpt8RauH2/ y924kAJsCFSWKpA+xhY1T8LuPAOb0CiCC7NJ3HO6SbiLTGufqyeFWspqV3FE9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681012455; a=rsa-sha256; cv=none; b=dheskhVcuc9UrgRXcGHg7FLLd21/cfzLQRQ5GpXLzuNdhtjtSrQTBOEju1pFgrB4dEdVbe sbqRhEaz1OcPQQ3JdLFDLOZI8Ntz4/o5YyZXyYmBdedzrPcyLNqThaoBSoxFx1hIHIXw+m XEb7+UL8F3KgktkuPi7kbGTXU4TL57qMVRRXAhhod+s/mCio4/9A+lJ4BUIXBgfXkmfPra EM95zB8Y2+NsyGmvUDYnNVujioCKvtZpcxyS1F4W1A3aV5LDHx41fb0KpVYf8s0o76UdP4 eJGRcYSd8KIXnB3yDBuOFs2aY98/HOFXzheHmjvngeg2kcYdtsRQVk4hYsDtjQ== 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 4PvJBZ68p2ztML; Sun, 9 Apr 2023 03:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3393sEuM024153; Sun, 9 Apr 2023 03:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3393sETv024152; Sun, 9 Apr 2023 03:54:14 GMT (envelope-from git) Date: Sun, 9 Apr 2023 03:54:14 GMT Message-Id: <202304090354.3393sETv024152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4a99b854723b - stable/12 - wpa_supplicant/hostapd: Fix uninitialized packet pointer on error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4a99b854723bb28817b01eb7bf485a072a02ae5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4a99b854723bb28817b01eb7bf485a072a02ae5a commit 4a99b854723bb28817b01eb7bf485a072a02ae5a Author: Cy Schubert AuthorDate: 2023-04-06 04:07:15 +0000 Commit: Cy Schubert CommitDate: 2023-04-09 03:52:35 +0000 wpa_supplicant/hostapd: 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 Reported by: Robert Morris Fixes: 6e5d01124fd4 (cherry picked from commit 953efa5b200f060564a090ab71b3d7f614a35e3f) --- contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c index 0461758ff210..7b96bd033c87 100644 --- a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c +++ b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c @@ -85,6 +85,7 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx) if (pcap_next_ex(pcap, &hdr, &packet) == -1) { wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?"); + packet = NULL; eloop_terminate(); }