From nobody Fri Mar 10 13:29:23 2023 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 4PY6N32dsmz3xX9Y; Fri, 10 Mar 2023 13:29:23 +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 4PY6N329ZYz3hCQ; Fri, 10 Mar 2023 13:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678454963; 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=cfbsxs7NcqV7elRf+GPpJgLQ6bW2bFhBKDh7zMF4lfg=; b=wowPEQC+E8Y9NZ7aPzeRuenS/v8hR0BuQgKYLz8XHlbJT+k+kp1Zgx9l3i4Yvx0I2WdDqu uxzyDFtzlJigETUXYPCZxRFdnK72WkoC7I7XZqvWtlvi/DdPedQwB6bw5d1OA9rXe4iwZv 5lQD0SRm+CNyImZYLeS6DYbXRU86unF1ZqaFnvrUxkeysQg6jDS9efNLN9T1aKtr5TGjbA 0EQRtjCqXGMJu6ownPJcKp5nRoSjMfnL+UQ90U5OoErRiqE0y4kYC7xrKjQiVolSAcVKuc Wnv6MiL6wCVWJIEF2i7HQbZ3nIwaIFHbTAX4iinzYPAZEDI04STkzHqAkoUvGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678454963; 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=cfbsxs7NcqV7elRf+GPpJgLQ6bW2bFhBKDh7zMF4lfg=; b=RSfa1C2qJITk8wkw+3W47XtlUscfjOwd0NOgJWuwkja9IFLONE3ZLKzLrP1980CrYEDD2m 1SE3w64ZTLTSdVyme8MRBAppupkVex3uYdHph5zY6NEbcU/2bSA0pIfRb0Wk6tq+aVCXfx UVcEgYnLLrFZI2OgRQTt8kHxCpn5R3guvgWmXicodlHgs3TTz1pxpNEZKdagyGKFTjmLoO f2vPQOoU0Li9tkMO/22tLeqxPqQFy0ldxkvxY1Bi60sHFBYET+kZi248AbXaUCWKmWtCSE 3t/x2mYQu1l5wnPBu2YxIkbqHSjl67ZbvC6riu7Wv5C+CCWyptMzft7mn47Rmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678454963; a=rsa-sha256; cv=none; b=Y7MmGVkvX57FxUXbSy/6etKzB7JGtV0930LMPpGqvY8fRjYA+qQ//d36omL7lTiaG+6nW7 jPcupF7caJxyxF7+i7/zN9xIUiOOcumpCBUzudTM+4XwgqlCPrKwzuZ9bYZol/Zf9i1keu bMNZ36Acr7Jq4206SLC3stwbXpb2Ba3zU58TBL7uvZoWQHh5hTnN4E0bVG9m1TKXaLCYdr vV9ilRSvL1cZCQHLq81QidoztpzHLZlwxoNAC0pvHUJ30XalLb+EqmJNoEA5wsvcI+9IjL 5DlPKkabgZ0JNHFvdpAcwC0sG50/bi2j/YzNs7nVcWPUnKSY0wDM901+kQgLwg== 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 4PY6N31HJ2zqfq; Fri, 10 Mar 2023 13:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ADTNRe090178; Fri, 10 Mar 2023 13:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ADTN5w090177; Fri, 10 Mar 2023 13:29:23 GMT (envelope-from git) Date: Fri, 10 Mar 2023 13:29:23 GMT Message-Id: <202303101329.32ADTN5w090177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 77e83935b7ef - main - tftpd: Don't forget to close stderr on startup. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77e83935b7efb0d881fdb77117eb992e807ed9d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=77e83935b7efb0d881fdb77117eb992e807ed9d7 commit 77e83935b7efb0d881fdb77117eb992e807ed9d7 Author: Dag-Erling Smørgrav AuthorDate: 2023-03-10 13:24:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-03-10 13:25:16 +0000 tftpd: Don't forget to close stderr on startup. Just like stdin and stdout, stderr is a copy of the listen socket inherited from inetd. We need to close it so inetd can process further requests, be restarted, etc. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38968 --- libexec/tftpd/tftpd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 8e3d2e13f320..b25e8b0c762f 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -381,8 +381,9 @@ main(int argc, char *argv[]) me_sock.ss_family = peer_sock.ss_family; me_sock.ss_len = peer_sock.ss_len; } - close(0); - close(1); + close(STDIN_FILENO); + close(STDOUT_FILENO); + close(STDERR_FILENO); peer = socket(peer_sock.ss_family, SOCK_DGRAM, 0); if (peer < 0) { tftp_log(LOG_ERR, "socket: %s", strerror(errno));