From nobody Sun May 3 15:45:49 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 4g7pyj5TXcz6W302 for ; Sun, 03 May 2026 15:45:49 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g7pyj1z21z3JkP for ; Sun, 03 May 2026 15:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777823149; 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=VbGfpiVqPMCV39h8ypHer5h3B4z0/Fku33hk/MJftRo=; b=k8i71c/EwcWtk/nBBmSDIGYK6Qf9AwcLYUG/d9+p/QVM5Wlv1tch3l+UzhCJ8GlbXH0hxe +BLcJKM7x94MOAWnYtTC7BbNfpbxC/rcJlqdVXqAr82zIgjF2TldQRGlvIr4Dt5NzOWbOp 2XCuzG+gPXcIN9gQ92E2TpPq5AF2uqeKuBFfM3+yewvJNy7OOWSG3J1QdjiPNgGsoflNQV OqTLCjSZc5nhYEidne9Ex8jv2TNR0Ldf/n+MWNxRLqB63qVfoIerZpsoMS/ApAXPVZUCZA L6qErB1mEM8moBHMcU4uVvfHbaApnLrbPD21zNzzWT44aBiAcS5dpKpjVl1B4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777823149; a=rsa-sha256; cv=none; b=UqZIkVJaOmzlvjg+r7guKjYPgXAPDHYNkuL0GVM4tSt8DsRTCZkJkqB2JX+RJF1o6NUb2d Hm7+YBg7Q+a7T08oznEfWlAXEoJwJ1kJlLa3dEe6xqlIHYem6dhM5YR/dem98I4KXgLoot adioTF1MnkCYtpqG8Ogi84esnE4U9uHOBonOtb2QfJp0xI0Pzu0xwHTP5OvPDWu+OsBfjX zPNo4qWU7ZmVq5gVYr0Xc3eAs0KR6GgmRvM5G2wv8Aa5Pt3/WHDUVpz8lIB7wLJY/5fCk0 2J36nnDNVhNrWs4+1dhK/zFuOwkU/P5JqHgSKcZwA8V0KmdAbtJf+BisYBGBSw== 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=1777823149; 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=VbGfpiVqPMCV39h8ypHer5h3B4z0/Fku33hk/MJftRo=; b=RywOe7IeHIPoj879Wf8EHcV3x7KFXl5LzQpyOxihP1USgSPLRekAK2Upn3Z5C8jZZwH+gL 48WQE45aUtLZpC9JaZwoSYRw7ZWKp6kAiEqXHrDKlmNMWAG/WHrpdEtdIdZ/XNFzN2TcM7 5MqsG4MUhfbw/AFnQLcfLkt95+bxef/KXu8thzqIy7YAMFayhSEr+n/moLi0dnBb9SEUVa 7xoKCapSBu8/UkrBUy9RaGSXzt7yqoGCx0SeJhvmmeCvJFfZzytUKMLsC68abvoWnv8RVw ZfjKEiJ7M7BuXRIYMqvZzFyvS6Q+w8qz5qJDzrlsQ82WdNTgnGNFMTXhyH/DPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7pyj1GzdzftD for ; Sun, 03 May 2026 15:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e42a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 15:45:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9e8d7d83ecfb - stable/15 - tests/socket_afinet: Fix the bind_connected_port test 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/15 X-Git-Reftype: branch X-Git-Commit: 9e8d7d83ecfbf8b34b785d7981a29dda567d0bc6 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 15:45:49 +0000 Message-Id: <69f76dad.1e42a.1e2d2217@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8d7d83ecfbf8b34b785d7981a29dda567d0bc6 commit 9e8d7d83ecfbf8b34b785d7981a29dda567d0bc6 Author: Mark Johnston AuthorDate: 2026-04-20 15:07:20 +0000 Commit: Mark Johnston CommitDate: 2026-05-03 14:58:57 +0000 tests/socket_afinet: Fix the bind_connected_port test The test verifies that a socket can bind to a local address assigned by connect(2) to a different socket. It was however trying to bind to the wrong address, and the check of the result was inverted, so this went unnoticed. It also needs to set SO_REUSEADDR for this to succeed. Reported by: glebius MFC after: 1 week (cherry picked from commit d3d0466cae546254c50c80cf3e0c060bbbbba53c) --- tests/sys/netinet/socket_afinet.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index c33fd94f7816..f462bed5c4ae 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -513,6 +513,7 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) struct sockaddr_in sin; struct sockaddr_in6 sin6; struct sockaddr *sinp; + socklen_t slen; int error, sd[3], tmp; bool res; @@ -551,16 +552,15 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); error = connect(sd[1], sinp, sinp->sa_len); ATF_REQUIRE_MSG(error == 0, "connect failed: %s", strerror(errno)); - tmp = accept(sd[0], NULL, NULL); + slen = sinp->sa_len; + tmp = accept(sd[0], sinp, &slen); ATF_REQUIRE_MSG(tmp >= 0, "accept failed: %s", strerror(errno)); - ATF_REQUIRE(close(sd[0]) == 0); - sd[0] = tmp; /* bind() should succeed even from an unprivileged user. */ - res = child_bind(tc, SOCK_STREAM, sinp, 0, false); - ATF_REQUIRE(!res); - res = child_bind(tc, SOCK_STREAM, sinp, 0, true); - ATF_REQUIRE(!res); + res = child_bind_priv(tc, SOCK_STREAM, sinp, SO_REUSEADDR); + ATF_REQUIRE(res); + res = child_bind_unpriv(tc, SOCK_STREAM, sinp, SO_REUSEADDR); + ATF_REQUIRE(res); } /*