From nobody Tue May 19 16:46:40 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 4gKgYX3t2Gz6fRgy for ; Tue, 19 May 2026 16:46:40 +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 4gKgYX2QkVz3CPT for ; Tue, 19 May 2026 16:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779209200; 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=KiIjVbR4fsRuJUiRy4Ybq9vjIF0Hu/a07hvjoc8pdLA=; b=kON6wq67Cnwe0WpJLtESS265IplqiD0dYvPfbmjNWEAeJcWObdIRN1uRwQXVO4GfJ1u4Gs vLsfaDLgLyFzOaxinWVDrHW5zG2qqYYIQwWbI6ChPE0Sv1NPNBn2ZBfu9YmY/4s5VymOQH CAp5EQn1moQqHcezImhkbbPBN8Exq293DM6MKMtaLnw0+59P/9weZYx+y5Gr6Mvk7kGEea RhQG+DBQEv3vy/j9e2/mKIvXIx6+VZxfl5Eau6yqZWFHiVw+z9ux8Jrf6WZ0z7IMGLM4K7 sqrGjH4tSivFiJ315sK35A8SF8wLzpyJiK0SxCXVSVyDwZoG5iQ4ADxPMRP2sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779209200; a=rsa-sha256; cv=none; b=CZm4MrBnoB1YR9yZ3ImZCVYdGe80hRYq+SHxmzJsDI+N7rgfihv33RN73xR7RsxtTPT+kR 0NKbYU9FZlTVyv6dKxbhQIOD4PVyqpQzkpmH6XD69twucSdEBoJNC2h7+Fwvc2acbWeL/Z UmElamsiLMxoGrsJizN6bgaSuFMqfuj5lQ6ErIslD3kBjry/uCN6sv7+uN9+Pydp6YxqtU jJkhXdJc7NK+mwLB5gupnKvPJCoqL8mxf5wesXc9ADwxKYeOLYdcxbLHmr5my7/Qp57rrN V94dn4RbTkeaE97fC2uYJXP1Kwp8wyxXWPHh6YejNl786lLx5GgO4yAmAFQMlw== 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=1779209200; 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=KiIjVbR4fsRuJUiRy4Ybq9vjIF0Hu/a07hvjoc8pdLA=; b=tVuoBTE5EcI11fFPcibV7Ujxy7JWOwwcjM7SArY28M7uA/Qnwl8wl2Ret7Wmo0eJO8yWkU xjPnOaV36OUueQ8y1skj05r3i6ZyLZ1MaTQ5gQ1dTOSo+e0RV7A55driKAAkgPFEl0wqOA JsLNmXS7MzMMOibnoG3sDV3TROQapvOMTKyjW/2YKBEzqn1NVKSboHAld6BchsVYcayXaQ 4++2yL76WklQsgMYeTHQ0OK5i0vsG6tSA0faHrMaX+aL54mFsinIEQf22ip0OGVko2IPue Hx8NZ8hpiwMtE1V1HN8g2mB73/M1TYg6Vo9RRd6a/Vp1tmfkBIhQtNuueZIqxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKgYX22YHz7xh for ; Tue, 19 May 2026 16:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c151 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 16:46:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 605d3bc3d21e - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 605d3bc3d21e8754d23db26a783e3fb9b44d1a36 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 16:46:40 +0000 Message-Id: <6a0c93f0.1c151.925dacb@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=605d3bc3d21e8754d23db26a783e3fb9b44d1a36 commit 605d3bc3d21e8754d23db26a783e3fb9b44d1a36 Author: Mark Johnston AuthorDate: 2026-04-20 15:07:20 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 16:46:28 +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 6fc98d982602..4928953a1d25 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; @@ -553,16 +554,15 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) 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); } /*