From nobody Thu May 7 20:40:22 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 4gBPJl1S3Sz6bwH7 for ; Thu, 07 May 2026 20:40:23 +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 4gBPJk6qvVz3NfW for ; Thu, 07 May 2026 20:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186423; 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=btRRCOaPyqTwHQrKP0I4n9vijFeXhSOSPzQMn7EozHU=; b=cBHM2GdnUBUhvI9jJYjLmVYiomVyTR2j976DXCd+0YdHpnLwg0c+UhkkeTZU5k8qUhNnDR Lq2dESznYZj3cp0CAPoDZ4FCqI7VzDXaJow+O1Lhq6RVW9nVwL9U/A+Twp7RJB5kl5qy2/ ya5Mw3l/1nXZNmBmT5oMJcGngQH1aCs0F1VKHXPHcn5KcKtEaf4/7oHdCAisAI+TCfx4Tq vuZWYmKp+GLVVEF2PPLBxwStR7SR84vS/5+nyOC8+gnkzvkAhcIWUs8TyVfcvvT73dZ+4L FozCHWuFT/gy/RybUrZmPTCFRJAhRBiaJISkLZvXVaBl02qBqV3sPSHWt4Az+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186423; a=rsa-sha256; cv=none; b=xxDujdxmaWQG5hG2dG5iqdq04zTrW2Jj/a6nhzQgenWFFP9jEqFwfVqbPvIQL1Yuhsjg5Y g/TQvG3qyU041sBxA2jD95Wb8FwK3NpLjoKsrK0rsvHa1hZ/udagzVVr3hew0iR64U12uN tO+bkEZfGaghSNV17cdzkvGuvY7PlrR3RNfz/rbu7S+dXFVhErnqMMxUiOSzxIhtmDHYOH Bk5Ef7r/1YcB865ifAYEy2WCT1OG2I6HvbTCl9pyNk3Lb2XvsfYYpUEhbh4/iscEMlTDcL wCliCuanp5gPedA5+m2N6UT6TF+zRX29rd2KQV8G4hTmX5yWny+x6IVJgvBIEw== 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=1778186423; 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=btRRCOaPyqTwHQrKP0I4n9vijFeXhSOSPzQMn7EozHU=; b=iYLnUt1pKXuJsfViVdnOP6YSrCfviL+YFFq3gKNJIUeOAy7N4Yhp7j41fxpWLW619Qmocb 3xjkBb5vi45kOTRGqkXwIQRf96AC7JvDXjFDt+QgJUxEYt9/+m5w5elunk2rhmMJcKdSlr CXZ4ACwRfFvpXanW2oUbp43xoajjPfBUACaNrTJD49bcGUo1V+dYa0oQhVLkUrQVLfJ/JK 3yWOY/5mT21g9W5J+8ohxc0xaPackYeL5SilTkD5bBZlP09mqnh6bV7qQT4stDsRkW9zv2 LAJqLyHYRMJZjGXYYSGT86vB60Ckcgac2n2soj1FGCFhSSrZYuWRvfbEOXunHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJk6Dj9zjMT for ; Thu, 07 May 2026 20:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 88e12ccd9afc - releng/15.1 - tests/socket_afinet: Fix the bind_connected_port test 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:22 +0000 Message-Id: <69fcf8b6.1fd6d.402e7c5f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 commit 88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 Author: Mark Johnston AuthorDate: 2026-04-20 15:07:20 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:39:59 +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. Approved by: re (cperciva) Reported by: glebius MFC after: 1 week (cherry picked from commit d3d0466cae546254c50c80cf3e0c060bbbbba53c) (cherry picked from commit 9e8d7d83ecfbf8b34b785d7981a29dda567d0bc6) --- 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 9c718fc5a901..56d98c7b3241 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -516,6 +516,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; @@ -554,16 +555,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); } /*