From nobody Sun Feb 18 18:58:07 2024 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 4TdFL74fmZz5BTrk; Sun, 18 Feb 2024 18:58:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdFL741lrz4gHH; Sun, 18 Feb 2024 18:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708282687; 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=S5mtgk4k5ZaE5tNRXmQKe9WtOn74YYWrmmpul18vU3o=; b=G4dZowSFQcFYqTfoLcQwCSClNTbWCw99Rfri/nAmD4x8iA7sBQy35ikG5nNRYBeZapjtcB /UVfy7SjEYxmk/G59PFGPFRo/orw/Xl6i+wmrExg5Lfu9Aryqs3xfoGEtvituY+UeKnWvI WCV1xs0QArW495ugRXyHy0wxcc1d2Ae5M9Q3+dU47yxNGCsIzKF3aJuU2qXUZyW94UCZ2V RDZHLRAuZQaHVkS885GLzfDwg4gDgRdWWjHmSJL/OPCsCUReJfBCO0VF23wxKjzyn6sYLg G6m0qX7h0S6j5cG82yAuWTpOJZCifQQYl9RKHJQN92+MOguPPOmmpjZeATrWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708282687; 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=S5mtgk4k5ZaE5tNRXmQKe9WtOn74YYWrmmpul18vU3o=; b=SZSX042YO1+welGE0NHICVG0XzCqWfoZyb4O2XK+loyks4L4KHLZlQRE28H1gdN/ZgY4Dk 39sgihII7aVZJuPYeJlMNwzgLbFq9XxbLgVt/aJXMVRLO1L/iuEXo5O+6NqqBGziN5PLnJ Q56N3eg1sI7Q20gB/6irP8uv+/IJjpbdiwVvJ7OV1JAPepKRPMj9kh2nScaEmVwPG/3091 1X/oCujiqx9W7ejDvScRi9igASfNNOb3bzg62pdvufX7rjbIG37g+dVyTryDIfsCvKWzsK cTXbMalEb0MjHX6vrO9AWHhGJvDjIgqWJVbVaXkoh9sRHXdS5EimSc1EvG7h4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708282687; a=rsa-sha256; cv=none; b=ed5DMgb3QUxHCwZBg+SuIC3zYT2zEmBRkzeUsO8k0QSE1vbgBJm3O2tJrfIUeaCFGUu1aP V+ETP3eDkcikL0yGCmNTml1phPjSuGYwX+QS1S+q5rdLtT7JJww+FALaxis7MTka45qNpS N6kyh/bUI7BvFro8KzqZAVGC60VhH7cIUuic4ZCOMfXVPZudU6RRwq4rnLGD0TNDLU/mkP 43BRcijetOuqOqbL+fV8Tbcwu6pxMHaaZixPhuCVJSmaCy5vuGCw3CvaHsqjPOC2t9aZc+ p6HWKnJJFSTwWyyDkRHE70dVxaLY4/9AkCwERSig3Ri/VsWH8keTAusziDHLkg== 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 4TdFL735qJz132S; Sun, 18 Feb 2024 18:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41IIw7Y6082444; Sun, 18 Feb 2024 18:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IIw7Tw082441; Sun, 18 Feb 2024 18:58:07 GMT (envelope-from git) Date: Sun, 18 Feb 2024 18:58:07 GMT Message-Id: <202402181858.41IIw7Tw082441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: d0bf8b5aaccb - main - wc: Fix SIGINFO race with casper init. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0bf8b5aaccbe082d3728279620b8f8474d9ca8a Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=d0bf8b5aaccbe082d3728279620b8f8474d9ca8a commit d0bf8b5aaccbe082d3728279620b8f8474d9ca8a Author: Bryan Drewery AuthorDate: 2024-02-18 18:55:11 +0000 Commit: Bryan Drewery CommitDate: 2024-02-18 18:57:42 +0000 wc: Fix SIGINFO race with casper init. If a file is specified then fileargs_init(3) may return [EINTR]. With the SIGINFO handler not being SA_RESTART this causes an early exit if a SIGINFO comes in. Rather than checking for [EINTR] or changing the handler just move it later which resolves the problem. --- usr.bin/wc/wc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 76b65e5f870d..4e8a2d8a8b59 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -117,8 +117,6 @@ main(int argc, char *argv[]) argv += optind; argc -= optind; - (void)signal(SIGINFO, siginfo_handler); - fa = fileargs_init(argc, argv, O_RDONLY, 0, cap_rights_init(&rights, CAP_READ, CAP_FSTAT), FA_OPEN); if (fa == NULL) @@ -137,6 +135,7 @@ main(int argc, char *argv[]) xo_open_container("wc"); xo_open_list("file"); + (void)signal(SIGINFO, siginfo_handler); errors = 0; total = 0; if (argc == 0) {