From nobody Tue Jul 14 23:08:24 2026 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 4h0FN84jHqz6lRjc for ; Tue, 14 Jul 2026 23:08:24 +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 4h0FN83HTGz3Hrq for ; Tue, 14 Jul 2026 23:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784070504; 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=INomFkYzOC4adiC9ivUEG6AKrW7NlB5yloLxDKHZbTk=; b=K/jDHAq1UaTcT98BIf/vlwCLy2yA6qbHSTijh/WBUVC/0pTo4t196DkvGMxD7LRLIWXt2e RXrOBR5ueLVhmPXJjbMc8eWkLNuJfx4phXF68Esh0cLvK+lUD6L2HPskHupjrrj+F1H07C EJKraDVKuj0VhkNtrBaQ/EJpmys3fkHtZSl958TN5rSv3/xwSymbvjlDjx5EtGFfJQQsBS Nn+kSTDdQXTcpJnssvwZFNdzTQlAVXjO1YhlyjizszgYUrkM3jX7JQkJKB+RfoIbFg14qW jdmNk/A9Jsl632afTgOMgha5Dp5jc8vF0mpwTVlxfdOUTtn8W/6x/tzANRXQ0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784070504; a=rsa-sha256; cv=none; b=qKimHK410VwV5xXLa7PKizFSQf76ICiNQJkfs/k3jq/H/AMP5QG3yJVhmCWlnRJHJKgVjb f8vUtdgST7fAhtrQLUCHKw8PW9GBekFJdLQOHfkZ0kjh1lGjFSGNjR8HmhdhdzETVYvsJX ZV7yhKaoVFPuIen+t1lH1xSk+W2e2zMjuLgjX/c0nhJiceU6/kBy8nhRCimkgSQXYoGxGe s0GtG3jd10OT8yRsS3ccPCJV9bUDXzSTLsJynZruYCOcFrfiuqO7c+uTdMeKGDW5Eg3D2F qJ+uFT7UR646zvR3jIfGgQvCyTY2FxGEj1P+NIhgeEfvZ+22b6Gr1Gc5nACpRA== 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=1784070504; 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=INomFkYzOC4adiC9ivUEG6AKrW7NlB5yloLxDKHZbTk=; b=vvdie9bf/QjF5qYd0iqHas5MRR9rPsvk2jw5oTPAfQPOzRrl6xyWnfaLrTCUPJlVUVrf9X ohAbIUVv9xYMrC2xn6gJobhntqmOhcKEEYR04c3nvn/W+ILt+Yv14elXipg3lNj5KijKlJ zvylcYdP0pDDINKiQeJ2ptprKgJWd9WQoQpmm6CAw67Qc9iWX70/q4h9cNu59u3FSwH8sv nD7gMjtrJO6ymfIEovMEp7M1n6QSin1O70MUPmSfCvJp3n6wh59eKblcqR+JfvMqz31Obu t7W9saOstc2rNqIW0urJBSiBvYNqNUMbXjBH1oF2FDjPThzICoDuJnz9qQ1aJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0FN826Spz1531 for ; Tue, 14 Jul 2026 23:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23789 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 23:08:24 +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: 39e1726a20c8 - stable/14 - accept_filter: return different errors for non-listener and a busy 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 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: 39e1726a20c80c8acef7a45ca1686ac8a4646c6f Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 23:08:24 +0000 Message-Id: <6a56c168.23789.eefd7bc@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=39e1726a20c80c8acef7a45ca1686ac8a4646c6f commit 39e1726a20c80c8acef7a45ca1686ac8a4646c6f Author: Gleb Smirnoff AuthorDate: 2024-04-25 04:50:58 +0000 Commit: Mark Johnston CommitDate: 2026-07-14 23:08:12 +0000 accept_filter: return different errors for non-listener and a busy socket The fact that an accept filter needs to be cleared first before setting to a different one isn't properly documented. The requirement that the socket needs already be listening, although trivial, isn't documented either. At least return a more meaningful error than EINVAL for an existing filter. Cover this with a test case. (cherry picked from commit 19307b86d31b7dea4bb5c3f7e233ee0e59049258) --- sys/kern/uipc_accf.c | 6 +++++- tests/sys/kern/socket_accf.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c index c63b5a1179bc..9e30e7839103 100644 --- a/sys/kern/uipc_accf.c +++ b/sys/kern/uipc_accf.c @@ -276,10 +276,14 @@ accept_filt_setopt(struct socket *so, struct sockopt *sopt) * without first removing it. */ SOCK_LOCK(so); - if (!SOLISTENING(so) || so->sol_accept_filter != NULL) { + if (__predict_false(!SOLISTENING(so))) { error = EINVAL; goto out; } + if (__predict_false(so->sol_accept_filter != NULL)) { + error = EBUSY; + goto out; + } /* * Invoke the accf_create() method of the filter if required. The diff --git a/tests/sys/kern/socket_accf.c b/tests/sys/kern/socket_accf.c index 747bcda87010..ae6522397cf7 100644 --- a/tests/sys/kern/socket_accf.c +++ b/tests/sys/kern/socket_accf.c @@ -209,11 +209,43 @@ ATF_TC_BODY(tls, tc) ATF_REQUIRE((a = accept(l, NULL, 0)) > 0); } +/* Check changing to a different filter. */ +ATF_TC_WITHOUT_HEAD(change); +ATF_TC_BODY(change, tc) +{ + struct accept_filter_arg dfa = { + .af_name = "dataready" + }; + struct accept_filter_arg hfa = { + .af_name = "httpready" + }; + struct sockaddr_in sin; + int n, l; + + l = listensock(&sin); + accfon(l, &dfa); + + /* Refuse to change filter without explicit removal of the old one. */ + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, &hfa, + sizeof(hfa)) != 0 && errno == EBUSY); + + /* But allow after clearing. */ + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0) == 0); + ATF_REQUIRE(setsockopt(l, SOL_SOCKET, SO_ACCEPTFILTER, &hfa, + sizeof(hfa)) == 0); + + /* Must be listening socket. */ + ATF_REQUIRE((n = socket(PF_INET, SOCK_STREAM, 0)) > 0); + ATF_REQUIRE(setsockopt(n, SOL_SOCKET, SO_ACCEPTFILTER, &dfa, + sizeof(dfa)) != 0 && errno == EINVAL); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, data); ATF_TP_ADD_TC(tp, http); ATF_TP_ADD_TC(tp, tls); + ATF_TP_ADD_TC(tp, change); return (atf_no_error()); }