From nobody Tue Jul 14 23:08:25 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 4h0FNB18yMz6lRfG for ; Tue, 14 Jul 2026 23:08:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h0FN94dCpz3Hrt for ; Tue, 14 Jul 2026 23:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784070505; 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=3UPyh/nbudl+oF3d8XUBdIb5/GZ932TFVOteDHt6vEk=; b=ppLpnN79tJPSsEJrkAxj512NOQIFK22x2YmxWXDErcUzjPqLcHOn/frxSQU+IIr7jmHB4b 6GhUxHBaVYka6gloaASUQp4qoJvKctW9N7kF4UWcu97ulPweMuNEh13XWKJFRT5+Omy2EB mHXC30tUGsUJQBsWumQL2bIU02JT+Cxi8IXcyjipfxXkqtR8PT3idZHsVWyHmUjymX1ZDO 5RwdzmB1+aWU3mtD7xC38JlvOJ1ot+95vhS1rRPTHaTQyUgJS7TgDK7ta7yR0azgPTWU4H ZOzG3sBJumDZFWv5bBjBNGr+o0XW3lwKuHj9qHvifzQNlZ3MGtnQs/shpwC3/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784070505; a=rsa-sha256; cv=none; b=i+okLpkZt/pWDa/d0hlLzxQ1py42Zal7+5q1CpdAQ2lOP7LX4frvYziznD9BJfeUVeOZsT A9wxpiDvd75U1IxvOA1K5iIN3GkM7ACoeWerJWrtre6sNs7NCp598LjlxbAgMM0OBfg1lU qHRjcPxCnapv4PYzRtrcVB5iysKz4IFXSyIR9PTDAi3n4qxMdca56Yn0uv97E6Ij2n6hkD QqvCEip9HBr94uWqqT2n0zOakQBu36X+X+/0GrrUniVnic02NhfHKFI3pAStqXYGz0ATJE 1iOUSlzXdyEgPU1TqGeY6n4RGTIdQis8w5g8yWzI1gDLZmh+zHfOJg+oZKhlWg== 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=1784070505; 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=3UPyh/nbudl+oF3d8XUBdIb5/GZ932TFVOteDHt6vEk=; b=UL5u5+fzEn7Nv+XnXgPT8Pl5xxliMw1LBXghQcBF1GuLDfzH8mlJmtGX76MTXKnhdfT4sU FhyRcBjjf93SYqw9BUIMEsiimbnEYQ7sRXmaMYu/kFe9i10Y/N0An7dQ+RzPE39//+TvKH BDxTOrrbrGtvaMK39nQOQdGEM0nKuKl4mCb2vv//O1GCEpoEKNN22zOW26LJ/frxx6TksJ Zwfu1y0iIzSy/4KHjQhMFjwZU98mRyEl9IVmWZhiCshV8kUEtbYvaQBdCPtqaLiu4Lv20P kEUICh2kuWtH9k9z4GTCwCsWj6jGmrHMCS/DqU2ImYdJbHm6R6vgS6GF8LuNBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0FN92x2dz14Wx for ; Tue, 14 Jul 2026 23:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23175 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 23:08:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Mark Johnston Subject: git: e56cb0b4cc3c - stable/14 - sockets: inherit SO_ACCEPTFILTER from listener to child 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/14 X-Git-Reftype: branch X-Git-Commit: e56cb0b4cc3c48bbf287fc5eba427c66b228acbb Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 23:08:25 +0000 Message-Id: <6a56c169.23175.554d364f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e56cb0b4cc3c48bbf287fc5eba427c66b228acbb commit e56cb0b4cc3c48bbf287fc5eba427c66b228acbb Author: Gleb Smirnoff AuthorDate: 2024-04-24 00:17:14 +0000 Commit: Mark Johnston CommitDate: 2026-07-14 23:08:13 +0000 sockets: inherit SO_ACCEPTFILTER from listener to child This is crucial for operation of accept_filter(9). See added comment. Fixes: d29b95ecc0d049406d27a6c11939d40a46658733 (cherry picked from commit a8acc2bf5699556946dda2a37589d3c3bd9762c6) --- sys/kern/uipc_socket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 515f038b78fa..c9691d351a58 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1166,9 +1166,13 @@ solisten_clone(struct socket *head) * including those completely irrelevant to a new born socket. For * compatibility with older versions we will inherit a list of * meaningful options. + * The crucial bit to inherit is SO_ACCEPTFILTER. We need it present + * in the child socket for soisconnected() promoting socket from the + * incomplete queue to complete. It will be cleared before the child + * gets available to accept(2). */ - so->so_options = head->so_options & (SO_KEEPALIVE | SO_DONTROUTE | - SO_LINGER | SO_OOBINLINE | SO_NOSIGPIPE); + so->so_options = head->so_options & (SO_ACCEPTFILTER | SO_KEEPALIVE | + SO_DONTROUTE | SO_LINGER | SO_OOBINLINE | SO_NOSIGPIPE); so->so_linger = head->so_linger; so->so_state = head->so_state; so->so_fibnum = head->so_fibnum;