From nobody Mon Jun 16 08:54:14 2025 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 4bLP1y5Wwnz5VqBf; Mon, 16 Jun 2025 08:54:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLP1y2wKRz3wbb; Mon, 16 Jun 2025 08:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064054; 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=Z3+6lWlhD8dyyLdzBnqQdA+KFJcj+56gYAxpt+nmaV0=; b=Sgi43nenYYYrGnAZ7XGKMOTOyqwRd22C6FLTW0HxnkeAVHvz/MLpYwFpSWURD3F+xB9LUq dA+hwwFqMFDkN5Da4VVI1V5Y+WIbXEUMjv4mf5VqqdpSrh0IpLkWtPmVu2smb0GdZ+ba04 C2pRRjLj1+dpGz/HeU6oncKgdupiRRdH0kSMSL0OIPZ7RWybT8daLim1DS7ufKuxviVx2v A54tUTe4JICDfRCweHSiv5QYyQH29VbGdaL6HF0mgHF2mgazontoK2fT4EUiMx5bZkuip5 iCxRfvqGRgBLVJW0t0kNjARbHoc6A08A6QqIl/NS5ImEn+Pyx/Yb3D0d7w07eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064054; 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=Z3+6lWlhD8dyyLdzBnqQdA+KFJcj+56gYAxpt+nmaV0=; b=Rtjnkw9M1wHCf0tXuskQ3B9iyYrjHGbiXasj+lQAyR4vHuQ0eXYpFf/jZFZQI46Owv9Cbo oZBdOrN3mWDtHiLRiRBx+GeMyvIVOgoGZeviTWcMUOMOHkag7rvXGJElLW0g0GMNvEsKxN KlOtfPEdCBJQ9CngBfKYWFbm0fE7p2X+mPz9dv1AhrCbss/jc0DVnzvGjKvGNOJOB1hdwn 6ina/L7jmDyyPnOdFEggJFo4di4T2zJQfySgFDh6mQUy8/n+iZCAo+m9pRXzmBhIgBwuZw nubigdPilA1Dn7rSae8fexeD2xNRzKen13kpx1fV2RyAGmsa6340rtC5GY310A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064054; a=rsa-sha256; cv=none; b=EHz+UF4n/2JLK8McMn9BG/wVDTiEp6AdzD72zAAw7oyKLgUN+UAIsPe2XIpopavw4k2u1r yRt2VpMF/buc7fESVvHdHyPHQEks+crWThXzfidiHq1n9wkBbQ9fo0nCHwHJagm4s0fPRR /niDr0rLPwcMGMYuLbWj9Vhg4Z3aELtOEHiwLDz4ZsoObIDSpRk7mYIFtRZqb1SQpQSHF1 xpSO2IcJtn3S4ZYVZAy21wT33OLcxW9bLh6IUQ72FcyumZk1DnHkmwSpwG5AatBzK5ROT2 EjxdS66FTF+vHnrQYL7OJ32twzNET3hFmFpWysdfPXCO0FKN87Ib0VLylzBZmQ== 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 4bLP1y20q0zrJ3; Mon, 16 Jun 2025 08:54:14 +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 55G8sErj043620; Mon, 16 Jun 2025 08:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8sEpp043617; Mon, 16 Jun 2025 08:54:14 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:54:14 GMT Message-Id: <202506160854.55G8sEpp043617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b535341df32c - stable/14 - timeout(1): only start the child command after the parent is fully set up 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b535341df32cccaa097da4be304b0fad2290ab43 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b535341df32cccaa097da4be304b0fad2290ab43 commit b535341df32cccaa097da4be304b0fad2290ab43 Author: Konstantin Belousov AuthorDate: 2025-06-08 15:47:49 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:54 +0000 timeout(1): only start the child command after the parent is fully set up (cherry picked from commit aa8cdb7cae7b7550d5cb81d85ee294c4f182f694) --- bin/timeout/timeout.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 05904522c5b5..f47976aa27df 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include @@ -283,6 +283,8 @@ main(int argc, char **argv) int ch, status, sig; int pstat = 0; pid_t pid, cpid; + int pp[2], error; + char c; double first_kill; double second_kill = 0; bool foreground = false; @@ -351,6 +353,9 @@ main(int argc, char **argv) if (sigprocmask(SIG_BLOCK, &allmask, &oldmask) == -1) err(EXIT_FAILURE, "sigprocmask()"); + if (pipe2(pp, O_CLOEXEC) == -1) + err(EXIT_FAILURE, "pipe2"); + pid = fork(); if (pid == -1) { err(EXIT_FAILURE, "fork()"); @@ -366,6 +371,11 @@ main(int argc, char **argv) if (sigprocmask(SIG_SETMASK, &oldmask, NULL) == -1) err(EXIT_FAILURE, "sigprocmask(oldmask)"); + error = read(pp[0], &c, 1); + if (error == -1) + err(EXIT_FAILURE, "read from control pipe"); + if (error == 0) + errx(EXIT_FAILURE, "eof from control pipe"); execvp(argv[0], argv); warn("exec(%s)", argv[0]); _exit(errno == ENOENT ? EXIT_CMD_NOENT : EXIT_CMD_ERROR); @@ -391,6 +401,11 @@ main(int argc, char **argv) signal(SIGTTOU, SIG_IGN); set_interval(first_kill); + error = write(pp[1], "a", 1); + if (error == -1) + err(EXIT_FAILURE, "write to control pipe"); + if (error == 0) + errx(EXIT_FAILURE, "short write to control pipe"); sigemptyset(&zeromask); for (;;) {