From nobody Sun May 11 04:49:51 2025 X-Original-To: dev-commits-src-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 4Zw9Jc1SWhz5wKxk; Sun, 11 May 2025 04:49:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9Jb3fxfz3x5j; Sun, 11 May 2025 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938991; 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=xcbp84ez0WBdxKKBbfhjCISAgfN453eOWw6vXGby6Xo=; b=p3Kt/VyJ3f8INvTNbAK3jN1/WVOSyACQp1BEjTQv2cogT6qR6O5Hw6QjBaqp6lR3qyKEug oF6r7BQe9O/mfH9OENekqmG/pOLETkWlPkj4Yxdlho0pMpOBJyW5ksBDEwVk4885UlYroH gC41M/aTStXr8hLIFik512Wip2I01pGgjlK0WoKmEPRqMMsUH/TppUJKB3Cnzkd15RSDbc jCOp74e/KV7g5ojL9dI7gKfcSamvPnNOziak3d3IuudGE/pM2E6Xo+z/XNxFm1M1V/HypH 2wDgwQenEDbKMoQOktU95AcY7qUhTArDYyppUPozZe5GCmGxLyqxAXIKsztCXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746938991; 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=xcbp84ez0WBdxKKBbfhjCISAgfN453eOWw6vXGby6Xo=; b=GNA2iUaplpxrjDDRmALxRb+lFA2aAJ5BDxuHBkyx0BASMPuRWgtOoTsfgTRk2Oj3aGEbW1 B3lUCC81YY4gkgxELE9oYF5YfL2+NFUcGlSC5kd27UXAGv0W9J0ITlbzOiYC1mMItuAwFn jPTpJYiJZyMdyNXFLyZJAU74fi+jPxFl5WpEBXEfS1M8VcJw+sMpqFcURdyJfXTb2gB+Cm B+51eRFg6g+ALFUjbl5MY9BmhKWX4cY1vHap7oaPMZuIq0q2fEUCtcWqlJF19lp/sGq7E8 Gc/zg+4XcV30Whc6vkTk1F5R+WObG466FxvqnOgURVLGawfIzQtzpXtwO74+8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746938991; a=rsa-sha256; cv=none; b=vd8sEGQt1LCO3TgzUxOsdsvPt1ipY+FNtSFQs5ZsL0b4eiF96aqjKghHom4HWhkn6D6oMU 6ZrXeidS2DT/+tDJxuwB/gCgYAXI1+vYuCxesBeClkvIt0naifoHpXOs02hlN/hubuI8FI xTir42l23pN6vwMhBWWWSkEkGV4vVPdOJpx7RdgPtbEwzEw+u0c1Q1mVv/NXnoZZtPoIKt z3TrHH5CO3f2r1BXaDDbhfwGr15JARqetlmsZzuoj490qRo4qI2cwCA8kpTCk/5JEdqPJh 8Nnqt9/TEjU98F0IEXvl1jcHRAsSYiLQdDIFLVKQb+K8kSkEmoIxSpcIbSBGNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zw9Jb38vhz2Kd; Sun, 11 May 2025 04:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4np8B083187; Sun, 11 May 2025 04:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4npBI083184; Sun, 11 May 2025 04:49:51 GMT (envelope-from git) Date: Sun, 11 May 2025 04:49:51 GMT Message-Id: <202505110449.54B4npBI083184@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: 70068b3030f9 - stable/14 - wpa_supplicant: Use PF_LOCAL instead of PF_INET* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-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: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70068b3030f95b3f83dd04515d58db2c7b2ad587 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=70068b3030f95b3f83dd04515d58db2c7b2ad587 commit 70068b3030f95b3f83dd04515d58db2c7b2ad587 Author: Cy Schubert AuthorDate: 2025-04-28 01:16:37 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:48:49 +0000 wpa_supplicant: Use PF_LOCAL instead of PF_INET* Using a local socket circumvents the issue of needing any Internet protocol (PF_INET or PF_INET6) support. We only use interface ("i" group) ioctls on this socket so we can get away with using PF_LOCAL instead of requring any Internet protocol (PF_INET or PF_INET6) support on the system. This simplifies the patch from 8c7149c73f8f. PR: 286259 Noted by: kevans Fixes: 8c7149c73f8f Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 (cherry picked from commit 6aeec6a741975143f53feabceb1726d5033aafd6) --- contrib/wpa/src/drivers/driver_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index 384c0a19cfe3..26d2f3e8a231 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1768,21 +1768,11 @@ bsd_global_init(void *ctx) global->ctx = ctx; dl_list_init(&global->ifaces); - global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); + global->sock = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { - if (errno == EAFNOSUPPORT) { - wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); - global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (global->sock < 0) { - wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", - strerror(errno)); - goto fail1; - } - } else { - wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", + wpa_printf(MSG_ERROR, "socket[PF_LOCAL,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; - } } global->route = socket(PF_ROUTE,