From nobody Wed Apr 02 16:25:33 2025 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 4ZSVbK6l3Hz5sVWV; Wed, 02 Apr 2025 16:25:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSVbK61Phz3rpy; Wed, 02 Apr 2025 16:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743611133; 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=eM3YhrlSgrTYDFcTjq8dOVXHjmlWzjM577jNcYaLLDo=; b=tEvrR8/n9wis4d2JQNfOflbAFA4iM/dFvOf1IuDk2CXSX/sPEcgacM1GBadYDKmrSY+c/P z1aebKiyBoLe4F2KrUPMWuJbqxo/XhjwXr4ENj7Es5k9etD80MNEV4DzmnzcX5WBc1S1qk AODJ1r0vcBW1q+ICmNEcTMn/m3snXTq3dDVi83V7EYe8SJGKg8R3HLmms3yxN5/c2b6Z7I eEk5PFrtzetT33sT+AjibLZ3CAHuaCnFKEdBnSuqnMrf9he2YtlczLw7qZH9IQGKc5+6GT MfwrgwuuhPzd55yY+DmaCBwkxzYDBdQQzIc/G1UeqqnJhYFwc6sU6dsAvzJCpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743611133; a=rsa-sha256; cv=none; b=JPUiATNhDawCpyK+QIIVPxwcJcNX71JJJ4F8hwJhextNlBw3kFN4821IVhXqGAH9qL6snR 6Qq1Thp9xGrK+WsCYDRxvPQ/yykJGYowOulqoN5Nw67/RaFjLh/3iWApdvVNf863jfl73u OHh2YlCXSlvk54R0jJ55bPRHiL0y2tOAAyF+kxdhJwvbNnTCu1aGBEBTh8u82PP4KodN9q gP4aJuVmFx3xBbl0RfXZQwWGo7zjDsHKaw4xMAJc+X0zf5OK9JZt8cbckEqVuFWVzO5niH 8m/FTa7Wnpkgtn4HYluh2T8wIDrrADFHXDSdceWAq0hzKYej6LRoeL496cOJHA== 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=1743611133; 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=eM3YhrlSgrTYDFcTjq8dOVXHjmlWzjM577jNcYaLLDo=; b=UTvk8PGXm+hcwHAJQlt4n00aB15K7uI0ifwU31lyaWuzIB8qqEFd++yuyH60+N55knYYw9 qcZ+g4Bu1F/znyR0CCNsapDKtYX1Dt/c1g9k3aTAfewMOuTr5dOACx5hFkfXYgC8Uav7V2 AZjKSx8zsgdPDvrgRaLyYzODhgLNShShd9q2SVpUmDPjI1RCaXK0wuNJUJ701uxqptK9Nl 1R9rYaAlW7MJ9D0dW+sO2TBfkhopTNvQv5SC0C5lR1BZRy25AJPgu2fqS4+lUXU01UUqCg 9dQ8pv8iQskaLIcAYJvB7eAYxFilxrb4znq9kRQIFZuN5bdoKNYyeCgvTfhYJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZSVbK5339z7Wx; Wed, 02 Apr 2025 16:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 532GPXon092755; Wed, 2 Apr 2025 16:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532GPXBp092752; Wed, 2 Apr 2025 16:25:33 GMT (envelope-from git) Date: Wed, 2 Apr 2025 16:25:33 GMT Message-Id: <202504021625.532GPXBp092752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ce9c46738295 - main - ktrace tests: don't use INADDR_ANY as a destination for sendto(2) 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9c4673829561bf66c78577be2b078d5662a33b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9c4673829561bf66c78577be2b078d5662a33b commit ce9c4673829561bf66c78577be2b078d5662a33b Author: Gleb Smirnoff AuthorDate: 2025-04-02 16:21:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-02 16:25:01 +0000 ktrace tests: don't use INADDR_ANY as a destination for sendto(2) The INADDR_ANY is a broadcast address, and with recent changes its use as destination for UDP sendto(2) was disallowed unless SO_BROADCAST is set. Use just a localhost address for a successful sendto(2). While here convert a couple checks that happen in the parent to use normal ATF_REQUIRE() instead of CHILD_REQUIRE(). PR: 285851 Fixes: 3b281d1421a78b588c5fc4182009ce62d8823d95 --- tests/sys/kern/ktrace_test.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/sys/kern/ktrace_test.c b/tests/sys/kern/ktrace_test.c index dfd60b73a5cd..785c78bedaba 100644 --- a/tests/sys/kern/ktrace_test.c +++ b/tests/sys/kern/ktrace_test.c @@ -378,12 +378,11 @@ ATF_TC_BODY(ktrace__cap_sockaddr, tc) ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); - CHILD_REQUIRE((sfd = socket(AF_INET, SOCK_DGRAM, - IPPROTO_UDP)) != -1); + ATF_REQUIRE((sfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) != -1); addr.sin_family = AF_INET; addr.sin_port = htons(5000); - addr.sin_addr.s_addr = INADDR_ANY; - CHILD_REQUIRE(bind(sfd, (const struct sockaddr *)&addr, + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + ATF_REQUIRE(bind(sfd, (const struct sockaddr *)&addr, sizeof(addr)) != -1); ATF_REQUIRE((pid = fork()) != -1); @@ -409,7 +408,7 @@ ATF_TC_BODY(ktrace__cap_sockaddr, tc) saddr = (struct sockaddr_in *)&violation.cap_data.cap_sockaddr; ATF_REQUIRE_EQ(saddr->sin_family, AF_INET); ATF_REQUIRE_EQ(saddr->sin_port, htons(5000)); - ATF_REQUIRE_EQ(saddr->sin_addr.s_addr, INADDR_ANY); + ATF_REQUIRE_EQ(saddr->sin_addr.s_addr, htonl(INADDR_LOOPBACK)); close(sfd); }