From nobody Fri Dec 15 16:50:59 2023 X-Original-To: dev-commits-src-branches@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 4SsFbR4Wd3z53nWm; Fri, 15 Dec 2023 16:50:59 +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 4SsFbR3cD5z4b3P; Fri, 15 Dec 2023 16:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702659059; 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=LPdv0KW/FZEJDADIRXhOGvlGVRtoJv/+bBICUjbvHKQ=; b=VZmT7JtWk4k6OQRkN1jWuZptabPDalhxG+DR6HDa2koTFKJrhu0iqbFKizLev098K7yBBs 5nINQ+K0bss4vjI73HzBW7nkCwaumV2po5qYyRx21TuRBJ6T1rGKCCVAQDuY4YtnmIxyCg WpXA920IxMgf2VK6b2Oyh1L/vnTQceS6gom2eCwoOnADJgXSzC7Mcsyq0EsYc/8BmQVYLA uEDIoR614gMs6WCPPAAI+qLmjVw+B3qs9ufc5XCTEy/XfFmKpUnqEL07VhNZNRd+uYED4u uwAO+STUS03kYFDxu9V0rdXEIWWPGDO2lDGdfj9nah3oN2raiE3hXDExz4UhlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702659059; a=rsa-sha256; cv=none; b=Pcrozw7eHJUujIdmL0kKIpaZI7G1ZKT5RKB6hL8rK+z8jCDPdBfB2tlMrjAemWeRvtp8BX T1NTfNfNU8CpiPoE/1e/FMziJiaC7kKFB3t1YimGHuqBJhm5+++XiQQcIfli9vzQuQm7D8 BICq3egnL6Hckd/7Mw6GETCL0ebeD9AMx2jXDpzj8zg7LiCfpMVQRGoiT1/4X7Jbddg7f5 Hw4pmmA+ljWC6QOkzKxaUKR/XkM0qxVQfGAAdxkebTMHpcjGwbZBWc+6hffl615gV61Lz+ 8PSBLEWaApFCGdNDZ8B6yDr/ivUfJN1UFTIhvhGJCWDJ1+OnbB2b7K/cH9EIUg== 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=1702659059; 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=LPdv0KW/FZEJDADIRXhOGvlGVRtoJv/+bBICUjbvHKQ=; b=vz5Gy81qv2S6GmgXetUnaHLNZJfJJH36YnwieT/dCVqL9DgkrNXo0QU3RMJ9hRBnpW6oHd 9tUn5doyMOaF5iDKdpw20lyvyxLShe3gkMRTArPVO3MfkkaZ7rHGCWV2HtV5VDr48xEhXQ pxK1IyZcU+3awzrG5bxbF9ik+O+sMdjNMf8mgvKHJr6rQS5gKKJqlM0JXsE17yhnlR7rxx 6FSjmV2u3VwJ0ihODyyriwgudVz6wgTTtkLeWMOj+hXlGvhOzuwppeuYgfgFzDG2cOOjaj PcANexGB0O1Bf4t4ade+fppjzIiudhUcGb6uyFrmlT+8D3D69qiQT9z0KXl3ug== 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 4SsFbR2dwYz42S; Fri, 15 Dec 2023 16:50:59 +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 3BFGoxN6011880; Fri, 15 Dec 2023 16:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFGoxp9011877; Fri, 15 Dec 2023 16:50:59 GMT (envelope-from git) Date: Fri, 15 Dec 2023 16:50:59 GMT Message-Id: <202312151650.3BFGoxp9011877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 579c24898b89 - stable/14 - lockf: don't hold stdin/stdout/stderr open List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 579c24898b89b87dc86095c3e55c1b1f8fca5e1e Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=579c24898b89b87dc86095c3e55c1b1f8fca5e1e commit 579c24898b89b87dc86095c3e55c1b1f8fca5e1e Author: Alexander Melkov AuthorDate: 2023-11-22 04:46:28 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:58:20 +0000 lockf: don't hold stdin/stdout/stderr open None of these are essential in the lockf monitor (parent post-fork), so close them to maintain the illusion that lockf hasn't been inserted into the pipeline. This ensures that the correct effects happen on other programs in the pipeline if the locked command closes or redirects these elsewhere. The original patch used -s to close stdout/stderr rather than closing them unconditionally, but it's not clear that we really care that much. kevans dropped that part when taking the patch, patch is otherwise by listed author. PR: 112379 Reviewed by: 0mp, allanjude (both earlier version), kevans Feedback from: des Sponsored by: Klara, Inc. (cherry picked from commit 18425c19cae08cbe41801845457ed67285806688) --- usr.bin/lockf/lockf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index ff1e7a6d6216..620193cba1d7 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -157,8 +157,11 @@ main(int argc, char **argv) signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); signal(SIGTERM, killed); + fclose(stdin); + fclose(stdout); + fclose(stderr); if (waitpid(child, &status, 0) == -1) - err(EX_OSERR, "waitpid failed"); + exit(EX_OSERR); return (WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE); } @@ -210,7 +213,7 @@ killed(int sig) cleanup(); signal(sig, SIG_DFL); if (kill(getpid(), sig) == -1) - err(EX_OSERR, "kill failed"); + _Exit(EX_OSERR); } /*