From nobody Mon Sep 07 15:07:53 2026 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 4hdr6R30LKz6rYVh for ; Mon, 07 Sep 2026 15:07:59 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hdr6Q6jj7z47F6 for ; Mon, 07 Sep 2026 15:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788793679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G+ZmKOdw0OdN15ICbX/bUhYFvEQSLVmuUxQ5xN/TitU=; b=FZFC1mLnI4+WYKfbRhMSFDjzOflJY6ezRHzLnGNvOLODBFVbuvGy5KKhOn2ginJGrr6Ybs UKYCd0uAinaYQfZv3d/uZDXE7FN84ipn0t2c1NuuUMuNA2P3nwYUEJ9IsftLT/FqxvZ+2j N/aNDY7cQT6ZfJPTc37ad0HnxwmIFbl+7MLmNc/mrhTpLuRTuLl/CwTn7Dk3GGNV8Xlh/e kW+CeOrSekVT+y8uhAwTP/FUg1P/SsjkliDZ03yl6IE259vXhQWcEGsyKhew4ENjFVv/38 6IzoymVpACnra1ZIssmtTA4Uw0neJyRbOi3pke0VphhYvkMQbmTvdJ3sI3ZkKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788793679; a=rsa-sha256; cv=none; b=SOhliL8ig2pG3wVaQRLLbMbrcRAmT0yHvNk7xIlf9JwmSYkIwiyu+Nmla3gC85iB0+G5Hv 0i+dYTZJZX5cAPbPWJWcneHESVuo2Y1JT+Avj+SBe8MdjI7sEx8W3ufKj6TzxyzMXTwpJF 8Zo6oe8YxMhuIbyLNsFbWG9vDRc3g1SMbDuzdbbcBelJm6wU34/M2CUhS68WbmnjYwXsrE 6sN5mpbymTG1j9lVqIvuokxVwEZhe94G2WaJA0gB5mjcNQDWRDRMmI4/4v+6YSd+jJTVax wsood1RslUMYl7Hurd0c6rUxUpwvOGKooxqcs+no+vZeBla32iN3N/QhxpttIw== 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=1788793679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G+ZmKOdw0OdN15ICbX/bUhYFvEQSLVmuUxQ5xN/TitU=; b=BCfdsZp6LZ7Z+QM6Fy32XI3KGx3EoDJLmAu+Q8gxDE9znkKdVTERhENNajOhNkGPcaFI8g KRjoVUjYqV5DvKCCOSIUC9qrnSN44hK77IldSQlh3k3tsj/+wO9Aa/62e/5nt4t+DKIAUW TEbL9JQX2hEbZHXKyk2HAMZhVo+xAJ/dV+wH6b6OxnCgASa+OAU2+xyV/zrMC/xK4VmHXa rg1jbjYRn70PyZQjP6qzhsURi3bsocDiZ8OmEmIejI8uq+uSSSgknjEXBXcgiO3xb83xbc nzBD1gbiGHxRU4JuQ2AJHhCaiMi0GQqQkQ7b2cEMY0+uBRC0xVRiC/n7GhO/Ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdr6Q5MVkz7HK for ; Mon, 07 Sep 2026 15:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1940c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 07 Sep 2026 15:07:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ryan Campbell From: Mark Johnston Subject: git: 7b76afd6c211 - stable/15 - netipsec: Implement pr_disconnect for PF_KEY sockets 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7b76afd6c211ee6a5881bfe37d5f91097a171f6d Auto-Submitted: auto-generated Date: Mon, 07 Sep 2026 15:07:53 +0000 Message-Id: <6a9ed349.1940c.1ea71469@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b76afd6c211ee6a5881bfe37d5f91097a171f6d commit 7b76afd6c211ee6a5881bfe37d5f91097a171f6d Author: Ryan Campbell AuthorDate: 2026-08-27 15:05:39 +0000 Commit: Mark Johnston CommitDate: 2026-09-07 12:59:27 +0000 netipsec: Implement pr_disconnect for PF_KEY sockets Otherwise close() fails. PR: 297977 Reviewed by: glebius Fixes: ea7be1293b48 ("keysock: do not use raw socket code") MFC after: 1 week (cherry picked from commit fef9077cf816a6499bd6a7f9678c179194463e43) --- sys/netipsec/keysock.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 23c155ed6aff..ee3ab9741a88 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -308,6 +308,12 @@ key_detach(struct socket *so) so->so_pcb = NULL; } +static int +key_disconnect(struct socket *so) +{ + return (ENOTCONN); +} + static int key_shutdown(struct socket *so, enum shutdown_how how) { @@ -340,6 +346,7 @@ static struct protosw keysw = { .pr_abort = key_close, .pr_attach = key_attach, .pr_detach = key_detach, + .pr_disconnect = key_disconnect, .pr_send = key_send, .pr_shutdown = key_shutdown, .pr_close = key_close,