From nobody Mon Jun 16 08:54:02 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 4bLP1l5wDlz5Vq1D; Mon, 16 Jun 2025 08:54:03 +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 4bLP1l0Lzkz3wWd; Mon, 16 Jun 2025 08:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064043; 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=stOH5DSqaWz+Xae20i/qZ3o6EvBXd4MNpw0Sc0WaAmk=; b=vT5/GLiYXFG3cmU0/E30rVCpLgIhrwuLVYrpLze16g5oJlIWzLcsfdyQMumTAZbwlSRp74 nw+lXLouZSb4NxrRCC4be+V+a7SjxQaIaqkt4qOdoQ3AS+18I2CWtc0VWNj2RoSqa7labL X6gp++BfXflAgMOh2yL6vTJ3wq1yGMroUKutOV/uJ2w7CQAx/AIU7qE42ZDQDhwbuU7Az/ 5ci+hHkoOm5zqzbYY3fm+tPkhWmqTWt5TERTndpWEAmCMtderqeOQQfO+0XyxGKjMpUPqk LO2XdwAm5yiUPaknozXtZydqPyPvIK1gSYf9t25KZBGDnXZv7iI07O/WQ4OoPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064043; 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=stOH5DSqaWz+Xae20i/qZ3o6EvBXd4MNpw0Sc0WaAmk=; b=whT5zBOZtaUqbOZWrtTpAernTZCbNqovIH5uR7WEO5H4e2bQQuXMBsW0++iretAfnvo7IH FtsOHv5OeTPYB10FCnR9lHGWN+2dTx0FpzIVEvyUuKddohe9zusmT0NEpakUBT19TqJZn8 yAjxi3cD2LFxAGQNstPpgGjLgKtKr1oeWbBb4GyUkKG10oGAnpJ2BZPeCouhVJM5/Jq0Sc 92Af6wip+V8TGbiDe7otKIMDs6iXc+hzSsNgzdwsCY7VRNZ0f/3EFFBPZCbFXzy13N/IdN AIAqtQ1GdXIr7472hFHJdvTaR3LAZYAmEEOcJ8YfJsaXkaMEULEudhwIPPYObw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064043; a=rsa-sha256; cv=none; b=Op2l4gmRh/c6mk3sdjUW7gAODq0UBC3/U+vFW0iNC7aDh7a+G1Pvd4x3c7pb41dAnpB5wK M8iHpnW+LiXKLKOPOBTsoNTErSnNQ4u0yDJ1nCQQvfVM2ZhhXPJYHO/h0yPgnVLU73JoOi QPq3zZQGzzt06eEKny8WsYWud0NqLFT9M6faiN/O+2MCemSl0r2MRyzJXbF2oDaWcawZ3W tY4In7LiPpN7foBO4YBinltWHhr6FqwMfscKLl/GfJLDd9wuN+rsc5RQTmCAU5nv44D0WT xvbjKNZ6LpFOUXUBKp0aJu879GJASok2CYWGbW8YO6VYFtHxhSSUF1JTLc8rYQ== 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 4bLP1k6y2Tzrql; Mon, 16 Jun 2025 08:54:02 +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 55G8s27q043279; Mon, 16 Jun 2025 08:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8s2jH043276; Mon, 16 Jun 2025 08:54:02 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:54:02 GMT Message-Id: <202506160854.55G8s2jH043276@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: e76807eb2360 - stable/14 - timeout(1): Also send SIGCONT because the child may be stopped 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: e76807eb2360f56a823569b9b751ee574e24aceb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e76807eb2360f56a823569b9b751ee574e24aceb commit e76807eb2360f56a823569b9b751ee574e24aceb Author: Aaron LI AuthorDate: 2025-04-02 16:01:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:52 +0000 timeout(1): Also send SIGCONT because the child may be stopped (cherry picked from commit 06c74693c286185f299410afcd312fc54a96a052) --- bin/timeout/timeout.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 8f933f509407..e702803a25c2 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -179,6 +179,24 @@ send_sig(pid_t pid, int signo, bool foreground) (int)rk.rk_fpid); logv("signaled %u processes", rk.rk_killed); } + + /* + * If the child process was stopped by a signal, POSIX.1-2024 + * requires to send a SIGCONT signal. However, the standard also + * allows to send a SIGCONT regardless of the stop state, as we + * are doing here. + */ + if (signo != SIGKILL && signo != SIGSTOP && signo != SIGCONT) { + logv("sending signal %s(%d) to command '%s'", + sys_signame[SIGCONT], SIGCONT, command); + if (foreground) { + kill(pid, SIGCONT); + } else { + memset(&rk, 0, sizeof(rk)); + rk.rk_sig = SIGCONT; + procctl(P_PID, getpid(), PROC_REAP_KILL, &rk); + } + } } static void