From nobody Sat Jul 8 23:09:09 2023 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 4Qz5Yd5wZgz4lwxq; Sat, 8 Jul 2023 23:09:09 +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 4Qz5Yd5Pgxz45ZG; Sat, 8 Jul 2023 23:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688857749; 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=xbEZQctwiT2SZ7UvCpAfiTtKA+i/2BU9lYfy60WMa6c=; b=wKPwIldQu0v/9IK5uoTGvf7y+X1Cld3g4uDcsymlFgcq1q8/GwNVyFUN2jdm0Thdpk1bPg iu1Kwg+KbyaWwMrbmBL5XGH9BWdSG1zKP599yfAxllEdTCdo47+HaJbQ9TMpVKsyJMAgXX Q+R+fHk+IadO1m+Mm3IqlJE68ExyBULB2Up30q1DfM8dKrxosI2mgUXbikMIRzN18AmZaM 2I9AgSXrTmUfaOnhyXIfWSTfQDqzAH97lrgNb5fWCjcs55WuIKkxRRA3Lh+18VX1XNaxHf +UKl25nYNJiFs56xA3eMKw1r/moXVy+NqNn9Svbwid+SIeRiD+BdMbV7XxuKDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688857749; 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=xbEZQctwiT2SZ7UvCpAfiTtKA+i/2BU9lYfy60WMa6c=; b=fbSx4prB1s993BR0f/2JMQwgE8b7F6BxBeONgC9YK4JvTCV/1+KOgX6BfQaZWWFdqmNqB9 EP5XK2ovvpRxBXDithQFdcqewqlYSD7JHjhP2tTUqMuXHAe0s0vlX/XCJWzuSgOMKGCbHR jNhKqfY0PZnYeP5zwpfTobcH1007br+UCsXKSH7a06rj//oRS4JueYS/k78i/+V1WGbiZS Hv7trSjrgCQ1tQQHrFnoqxwYy2PaMdjudd6w/MU5E/E1O5wucdIysE2dFrvVcNmebAb01W xPvYc8eI9mLRrPs7BRH5v0IKiknZCldL7S4THINqSw5mKqrTUJZBe2vJ6oeCyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688857749; a=rsa-sha256; cv=none; b=OzxrGI8VMRv+ko8LVl1FZeX6sJqIlNlPqgNcnB97XkRSHufT5XIApE/Ncm+hfIcvZ4weNu vHNsdtO5FC8nNi+Kh7CY9T4a9GtJnaDnC47Cv0yv2aRzMtNnvjFWCqEq2RQ8eVp09tdN+I gbqDaoSYwR71Oip8eZuvdNqY/AsDQdD+noHSAyboIUdlwg0T1gwBXYPFYZhwygu9gvHBYo N605OT8qreNcn+NSzyWjbhnDEdWc0KF29yqZKk/eUyfTL6gs5W46/AzOJQZ2BIcQK9g4Hg RAcgGpJk7/159EVsZHSphSyv926BOCqhIKD82Vc0kVzFy//de3iPZlIFyiI8CQ== 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 4Qz5Yd4MLDzfmF; Sat, 8 Jul 2023 23:09:09 +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 368N99WA009561; Sat, 8 Jul 2023 23:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 368N99n7009560; Sat, 8 Jul 2023 23:09:09 GMT (envelope-from git) Date: Sat, 8 Jul 2023 23:09:09 GMT Message-Id: <202307082309.368N99n7009560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 055f920ebe21 - main - cat: fallback on EBADF with copy_file_range(2) 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 055f920ebe21b8e05235363bc11a83cc649cdc6a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=055f920ebe21b8e05235363bc11a83cc649cdc6a commit 055f920ebe21b8e05235363bc11a83cc649cdc6a Author: Martin Matuska AuthorDate: 2023-07-08 23:04:25 +0000 Commit: Martin Matuska CommitDate: 2023-07-08 23:08:46 +0000 cat: fallback on EBADF with copy_file_range(2) When stdout is opened with O_APPEND, copy_file_range(2) fails with EBADF. --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 1158a839cfd8..44a406dd037b 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -283,7 +283,7 @@ scanfiles(char *argv[], int cooked __unused) } else { #ifndef BOOTSTRAP_CAT if (in_kernel_copy(fd) == -1) { - if (errno == EINVAL) + if (errno == EINVAL || errno == EBADF) raw_cat(fd); else err(1, "stdout");