From nobody Mon Apr 20 15:07:48 2026 X-Original-To: dev-commits-src-main@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 4fzpks0p9wz6WlTV for ; Mon, 20 Apr 2026 15:07: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 4fzpks0036z470Z for ; Mon, 20 Apr 2026 15:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776697669; 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=BV0mnhfUVNAEDI22nXLx89FU/s1kgbGocsKhkrBrht8=; b=Jnbkxwjw7KYDfF+frDyz9qOcb/gfsnTi4+4Y08h8TKcg8ERRjH+lVEjaKLBo5HDMKlHlcw 0qDt7rGmROdCBNsDSWl8DXtacJttVCiC0WaljfJhTd8Duxo+aiw76gUwL43nwbD8OfjsQ8 WVYS1spw/iK27xfSboH1y4nX0+fjoBL/0GZelp1fd2zxO60OZprEUJiloLN7cjU48K8PZb AifP2p47eLGR5wPYMsE+3LlojeAPLqJ3a1Xx8QvzviWjQMAslorJfj8J42oP5OMb+lpJaL JwSD4O8gYaSzu/HFpm9X+LmouOLvlMn/3dICmDGwKlbYa238Y7Qz0kL3haR+4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776697669; a=rsa-sha256; cv=none; b=soHu0BFIn348oAYhpPVIH+c3HMfd6UAkDUA30ITsrI6iUG2hQk5PDHbpRM8Ovd4WimX6at Zt6MfrQhtIvfKQxh56TIscA+1lci2PPlp6UQXWCUvkT86kiRsBFIikznlempTIcDlBtw61 HlBsC+rAH4nuUoDx/0BBr/ir+NeLM3EyHus4og0k1WZVRtQhbzikq5IMqEvZszIyC8apz+ p5IoEUCKzsAOUjaJJdOMCEr7BaxDPMKmGAu4Ggm7lYwEq0J8xiRwbEBDj0OFvx0jyyGegq nevPNI6YTyiaCRye7ug1uAjLMUY8d8WLsqZNF6gd51P9VFeE5ITkDzerUkAH0Q== 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=1776697669; 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=BV0mnhfUVNAEDI22nXLx89FU/s1kgbGocsKhkrBrht8=; b=D5JFJrkIebOvTAvrMk2iFp6l2zUbO3KDXnx40D769yENHnrf5xY3Lde/Qz2RXJ4QEDnb87 5GqiWD6GuubV+nVYbyMAhNKXKro9lKi4eVFMDxrYbg0OQiZZcXfVZBQ5tTI6aKpcAcQ8A8 ChGHOodkw5CGUuJ0WnahQy0HoVY5kRbxuzDXTxSooqCR9IpZiBd7ZEvuiRDcuWHLRMOvzA v3+8O2YiKKbEqjX0ssWre+l7RoX3hySLz26C7remNBBHGevmJspzb9J5FMIlHVIVu6w2LW S2ZYzp81WJKujpHEJ6ijLHL0QpI4FkIsj5CzlHtLuj/lrfpEqhuu7JaOCF+DAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzpkr6VbGz12DH for ; Mon, 20 Apr 2026 15:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2747b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 15:07:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d3d0466cae54 - main - tests/socket_afinet: Fix the bind_connected_port test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: d3d0466cae546254c50c80cf3e0c060bbbbba53c Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 15:07:48 +0000 Message-Id: <69e64144.2747b.1db98791@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d3d0466cae546254c50c80cf3e0c060bbbbba53c commit d3d0466cae546254c50c80cf3e0c060bbbbba53c Author: Mark Johnston AuthorDate: 2026-04-20 15:07:20 +0000 Commit: Mark Johnston CommitDate: 2026-04-20 15:07:20 +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 --- 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 cfa2c9aa1706..31c98f9bfdb1 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; @@ -553,16 +554,15 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) sin6.sin6_addr = in6addr_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); } /*