From nobody Thu Apr 6 14:27:59 2023 X-Original-To: dev-commits-src-main@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 4PskPD651Qz44QYv; Thu, 6 Apr 2023 14:28:00 +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 4PskPD0f38z3J75; Thu, 6 Apr 2023 14:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680791280; 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=bFrhd26ivdif//rXAYzwy6c/sTvLCp4h80x9mDYF444=; b=WMTg4L2VUp7oQSlD5GCQHx6cf7QSIbL2YSlZTNzoKI6tO09At8WVKbLoN/XSTPQLBtnNLt 3Zt4Ai35Mx1e0Bs8sOD8aQSRsEcpvPVBp/axGLht9z36JaMKiLUOO1KOXldDE0K+23GjMt hodluKszTlU8Xm5XkIxjiwZu4BdbmOWQDLL/AWYGgQPMFVR7/4qX17RwC+G9ZP2dfCcddy MU4bVY+FRDyPyfNW2Twamb3ruKDzAJvhoH7jGAV3mFEQhCGZzfHhnxLF2ju1PcQjNiyuRy b8yKAY+2Z9E7gSJX8c786KwXO2/umGw8QHvX4MlfFth7wM7uYBwea/vKgNraaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680791280; 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=bFrhd26ivdif//rXAYzwy6c/sTvLCp4h80x9mDYF444=; b=T4tRfZeasAqI56h2G/FY86EwfrxdkrqyQOhP46tYXIondSskn37MdjpyBoSaE2uJAaNj+r 0YpK9bpnKyyv2TTlYitxIncrUAoUZjPxBm59jXlp4wS2PMceF5LDXXrhxfPPKbB8ZZS3cd YV3o8WPDaWX3+jtl8LOR41XwyXCZZMfqKpWfrfl5SqjAyDNcm3cjOyJ8ZbLXHFUciLim3c R55iB/whFGaWKCkdJAevH+RYqIRevyT4FCO7iBDV/0J0rBxyCN6j8CbtlvOZaXw2fi0fAY BvdsmHak9RchWJKJTlh+cWpSGzMm+mcCJ0cfwlB7K7geKIpbwL7f+CrvqDWh4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680791280; a=rsa-sha256; cv=none; b=qZLIbLmXeDzRRDsE5jK2bqtB+P9phs2V4rdH97sc/8AWvGnM+Zit1pkCUaAPfSXGjyR/6b DaN2fqEb/tUltQmuA0gi11TlFRChN6UJGQH4TSjjStguYGFfVoeEpGEtyiwKGAZsbwM/mz lEeUKWXbwPdZy0sOkzQYxl67e4AaEMK3lMMZV7Jo2L4TYtRZoJbbBHuIo2UqZF9i3XB32x DqMT37evIYPvaS8czXeM5MpIjxgQf78JZBDvy5R3UfsVxht6dxHOQjyNC3IeluVdu/993R ktmDGjXxM8MaazhecVTwIjrivvFIXhpX6o/dGCSYPWOdH982Dix5O9/G+5NNHg== 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 4PskPC2xPwz16yF; Thu, 6 Apr 2023 14:27:59 +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 336ERxOm049004; Thu, 6 Apr 2023 14:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336ERxU7049003; Thu, 6 Apr 2023 14:27:59 GMT (envelope-from git) Date: Thu, 6 Apr 2023 14:27:59 GMT Message-Id: <202304061427.336ERxU7049003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 953efa5b200f - main - wpa_supplicant/hostapd: Fix uninitialized packet pointer on error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 953efa5b200f060564a090ab71b3d7f614a35e3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=953efa5b200f060564a090ab71b3d7f614a35e3f commit 953efa5b200f060564a090ab71b3d7f614a35e3f Author: Cy Schubert AuthorDate: 2023-04-06 04:07:15 +0000 Commit: Cy Schubert CommitDate: 2023-04-06 14:27:24 +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 MFC after: 3 days --- 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(); }