From nobody Sat Apr 26 03:21:20 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 4Zkw3N6pPKz5tXQ8; Sat, 26 Apr 2025 03:21:20 +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 4Zkw3N1rcLz3L0L; Sat, 26 Apr 2025 03:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637680; 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=U3cQsRTsBBWPvJzJRCMqlvjM5iS2WT9aemPt0YphRSY=; b=qZpRPnqGBnjZWRsNL02oXc8ZxJjnQeoBXfwO2n1qncfBjqScEYufaM4rGLcckBDzv0R20Y ID+RneYxVmNYnWfrWOr4a4J8WZ/PbqOYaOq4jxg8o/DvU0Hge5zbFNmmJ8Zk/z90aQSHK/ kZdDZZxotn8jLtbKA89qCBUqsvtlSSWZySu2/+E/joWkP+uWK+GOyp9w/5Cw6VDcR/MuME rqVdu7KI2rcGLM02xeAkeVZnThcXveGaAn8v27m4KpleWbEAbnKiBNon0P4v/QmEW4y0tB eYj9v/u7/ooLUpt873oG+Rh9lNSxYUL1/2kgRym3pFc5b0XE5PQi0EgxkbGXpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637680; a=rsa-sha256; cv=none; b=ksHRS1Zv0+yOuitPt1OGc2moGbHN7FGXTgxIv/YoNIdBclE1glVbzV4x2opl1P+Aa75c0Z ZDYpZxOQ/iEd/W3Yp0GLTsoqUMd3cfRCi9zs70beaxzXPoXEmJzRSo8AQpxIG1VQ0MAUBD eJqsSUGlUBxONJcRma60JRLFSBNTr3lKQfhm/sY/cT77/gsUqKUICZjr1xrvQsO0Xrm+gc ziDZfzaHsp3xWPkw3PgIvNmSOSPX5z+1R7WfxGyBSLE5LS3YTdcRMk8BffwI6cJCQrcaHL rFJXoYPhUxqOu2PGvGMAc4DVTq6dFPieGhDBAqMNvZ2Qykj5+huAWRZLGxT+sQ== 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=1745637680; 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=U3cQsRTsBBWPvJzJRCMqlvjM5iS2WT9aemPt0YphRSY=; b=SFKIpByI1Ak86IPiVwJ035BziKOpXaKHqpWmcOktUl5lVUjPrFX2q9bbEeSPx8FNBBe5k6 nTM94XSUXx+JPdeN66170SgoDZM8cxhMMBN09FiDX2FppRgiCZO6dwPVsStbQFGQabnyVD 8v+u54TcxmwxvddoV/gnAhsJzHkQXg27pnjDjh9PgdT5iuP7viLXWUrUdHjkFucoQ6frmg kOz192FWmdtyVHqb6WMD9g/SQQ0BlikYeY3DRZ4RNSZQgeSwTxj0oV00+Z7RFT8sGgV3Yu Bw+gmRwmjo+1raSG0ivRDbjYM3tBJTJCsSaehplkIaxRGwCAv55L741inxo1Rw== 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 4Zkw3N1Bwtz12x6; Sat, 26 Apr 2025 03:21:20 +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 53Q3LKCb009832; Sat, 26 Apr 2025 03:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3LKeR009829; Sat, 26 Apr 2025 03:21:20 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:21:20 GMT Message-Id: <202504260321.53Q3LKeR009829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 73f88915a119 - stable/14 - wireguard-tools: ipc: freebsd: use AF_LOCAL for the control socket 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73f88915a119eb9c323caf1537b3291129858930 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=73f88915a119eb9c323caf1537b3291129858930 commit 73f88915a119eb9c323caf1537b3291129858930 Author: Kyle Evans AuthorDate: 2025-04-21 03:08:17 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:19:49 +0000 wireguard-tools: ipc: freebsd: use AF_LOCAL for the control socket AF_INET assumes that IPv4 is built into the kernel, but it's completely valid to build a kernel without it. unix(4) sockets, on the other hand, are not-optional in the kernel build. Given that interface ioctls can be invoked on any kind of socket, switch to the safer one to avoid breaking on IPv6-only kernels. Reported and tested by: ivy (cherry picked from commit 0d238bc50d453d7ac29476fa71edd1fc9a5fbbf9) --- contrib/wireguard-tools/ipc-freebsd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/wireguard-tools/ipc-freebsd.h b/contrib/wireguard-tools/ipc-freebsd.h index fa74edda5a3d..446f13cacac2 100644 --- a/contrib/wireguard-tools/ipc-freebsd.h +++ b/contrib/wireguard-tools/ipc-freebsd.h @@ -15,7 +15,7 @@ static int get_dgram_socket(void) { static int sock = -1; if (sock < 0) - sock = socket(AF_INET, SOCK_DGRAM, 0); + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); return sock; }