From nobody Sun Apr 09 03:54:07 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 4PvJBR3WyQz43X08; Sun, 9 Apr 2023 03:54:07 +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 4PvJBR2yVGz47DF; Sun, 9 Apr 2023 03:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681012447; 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=EyLhMnEnzT+mj/LgB4zVrQEEnRRQUocqvCa9mFiihN8=; b=bnWbYi3AO/8sBK5A8J0gIiNhrUYZh9Gdl7aj/Mcl2XDmUEAg6FS/uRhAe1/ayM0U9qQtF8 i3NBq27Gd/pWW9I1D2ObUZdYTYgwxVLbm1GQUxSdSuYsvzjVtxCzbcn2XxiHa/0LS0Qmw/ awQ5QTgIhoHc2oG5tSpOE31uqAFTYy8b2LpxmvAg0lr7fZqZIzj8S+4hxZDBnJPaKzP2+n Ifzp0uMT1OBhgiHEMSrPV5y2pF03Q2Et/6KdLbXFtz8EHzoeopK8L5Aw2ofGKVsBqLrXin jsGro9tutIUFCYb35KXvZ58YS0PDrSYuqqHfNBChRsNwkNFCQqf4ya5ESAUAKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681012447; 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=EyLhMnEnzT+mj/LgB4zVrQEEnRRQUocqvCa9mFiihN8=; b=qNB6IVvcAvfAPsHJWQ6JZpzHylEDkFr46fuB2m+uCbDxuszSxiqAG/VoETjsTQlrP1lant D4jFfM079ayzhh0XuQfi6JCGp8Sn8MKDM7bDkAoM1V22tIOpdGby2MzYAFG+kDSCIIanRV dioVYGZc7ZZi/3TOJmF149VI2UhICL0VGF7aGlEeFlQLK2TREV7lXF/EeNoZd/rtEiUyYy xTzOSFFJWzMylMaQWVpeeBXyEL30W3UHfki/RgbTZCOCloyneUvlMIb2XQL1ZVJsnenEHp G3sQxJsL0WWPbL/aj1iK3iteoGnVhtQWXPBGRtEc4I/285SItapvUoePsZAxuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681012447; a=rsa-sha256; cv=none; b=jxre0NlgcMduGrf0MuFyV3WwmQIKy5/hMOQWh7YXy0Jt5HIuZU6ySrRMf4FrpucpLsHsRc PiAO2Yax7gvKXMJvi19zOqN1FxoqJIB5qQ7YcdIbEFsBmcXmd/8YmURCAIojgzFfl+NRDC xB9ZbVlzvVVB01Eduy6ZO/bu5/YIU7EeTs+MzInVhBAeA3aVLNHP4AlPmTbs+Qe3z5vhWA fyEhY0xUEBQGaO5n93VoV17kYGq/+5jp4+6Weja+uwxVzwsiRICWxbzX17wgAaf4SRwW4/ keuOyKlT4DNh5z/fTrjdS+HR+xfLBpyMSKk242ebVeYvv9gbkiIuCIwB//nzbw== 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 4PvJBR203xzt84; Sun, 9 Apr 2023 03:54:07 +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 3393s71w024000; Sun, 9 Apr 2023 03:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3393s7Hl023999; Sun, 9 Apr 2023 03:54:07 GMT (envelope-from git) Date: Sun, 9 Apr 2023 03:54:07 GMT Message-Id: <202304090354.3393s7Hl023999@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: 264e0365e8d8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 264e0365e8d8e491d1205f4b6489efca2d563eed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=264e0365e8d8e491d1205f4b6489efca2d563eed commit 264e0365e8d8e491d1205f4b6489efca2d563eed Author: Cy Schubert AuthorDate: 2023-04-06 04:07:15 +0000 Commit: Cy Schubert CommitDate: 2023-04-09 03:52:27 +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(); }