From nobody Mon Feb 2 15:51:53 2026 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 4f4WMG1GYBz6Qf0Q for ; Mon, 02 Feb 2026 15:51:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4WMF6H8rz3Fyk for ; Mon, 02 Feb 2026 15:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770047513; 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=F7khgSONj7GasGCSm+hZPLweaubfTRClTO8/Pa0vSBE=; b=uTyFOPZsKc78QCAF1IhUoJ85UzOuMu9Zj/jlKZ4xZQ4837L/NRuzUqkRHDmlLO+rp6zlYO TpqAdfHEHtme+7+3/YXWSAF281ieGYDQ2fnK3NO5YDi/oaRk2SJAFgLIQ2VuK4ODeOt9ai 5UklTebwqcvrdfLAU1V8EFtfsZO5hNhfMGd92e8Szw/YTsADb4Jq5qE2LrTR8xmeEROuJk oOsAeThqDxyC6jsDerO7HFwxPTYfUzaVM+qFD0kIR8fciYcGgfexQ/M7RwCyGJfE6PPvL4 od6T+2ZumQnat0Q5qh/1jS+Os86U5EVWueFw5WhHlxQ7qOEjWRkN11I364WWsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770047513; a=rsa-sha256; cv=none; b=B/HJ5MwemVX48I/R7PDY4Hly1hyeVfDoSX+62w2Zpd6Q7+Q5SH1RKhvr9o6IRWt0Aw0QpK hgC7C55R/CBf9uLpcBtGl6sTU90+8VLGP688CqUeYMEXI2wunQ+gehgTX/u4sRrD9Yy9eb bYf1mc9GESEVp1qsl2EqhX8lmLDtAwiHhKj1rXNrp8iysf6FgOAh85aHOI9LBQ6cwaSeY7 NINJOzXQBzOOAB7jQ41bk4CbNgy8c15Yw6SGNZHhiahCqCx5hjRTUq+KPo0k6QtFLUimts zubuFTt9sOhrRic0YyQIReit+gg3tVVRZBWScWDuRkmvusdMXpkH0hKiq/BNhA== 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=1770047513; 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=F7khgSONj7GasGCSm+hZPLweaubfTRClTO8/Pa0vSBE=; b=FtdS9hn+zrWfU+EJN2IOkfpcZTEMTZ+gNj6DzZrQfsDPyLWBMKVHU2PxUjj8we124zpyxT zN9XaOKdQBoAtKi1+lQD/x6vTXaj9tUuYcetsvjG2nFRSiS4z1usByjKLVBb0PKYtmemyZ BOJPlNwmfiXMpva0VQdUyROOnlJLMwJBhInNr2wzD6JSQFQvZIktlRcr1BhWZfQ0s7lNLT Z7Kv1VPZIiPlEtdER5A+0wbnXD/Y4Gwflb7Op4g+S4EUvSVi9U/l5Y0/LNDEY/07Nx1io5 DxOZfKQId0gclxkNVcy7qucdE59OMoYut3cI1asBOXZQWzaL2XFg2+92IhMVWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4WMF5bZ2zYpc for ; Mon, 02 Feb 2026 15:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d16e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 15:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5074d5c9845e - main - libc: Improve POSIX conformance of dirfd() 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5074d5c9845e142883cdbb9ad212be66e57615d0 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 15:51:53 +0000 Message-Id: <6980c819.3d16e.11cc28f9@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5074d5c9845e142883cdbb9ad212be66e57615d0 commit 5074d5c9845e142883cdbb9ad212be66e57615d0 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-02 15:46:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-02 15:46:57 +0000 libc: Improve POSIX conformance of dirfd() POSIX states that dirfd() should set errno to EINVAL and return -1 if dirp does not refer to a valid directory stream. Our interpretation is that this applies if dirp is null or the file descriptor associated with it is negative. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55025 --- lib/libc/gen/directory.3 | 14 +++++++++++++- lib/libc/gen/dirfd.c | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3 index ccbc60b03776..270abb2d2371 100644 --- a/lib/libc/gen/directory.3 +++ b/lib/libc/gen/directory.3 @@ -256,7 +256,9 @@ The function returns 0 on success and -1 on failure. The .Fn fdclosedir -function returns an open file descriptor on success and -1 on failure. +and +.Fn dirfd +functions return an open file descriptor on success and -1 on failure. .Sh ERRORS The .Fn opendir @@ -327,6 +329,16 @@ function may also fail and set .Va errno for any of the errors specified for the routine .Xr close 2 . +.Pp +The +.Fn dirfd +function will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The +.Fa dirp +argument does not refer to a valid directory stream. +.El .Sh SEE ALSO .Xr close 2 , .Xr lseek 2 , diff --git a/lib/libc/gen/dirfd.c b/lib/libc/gen/dirfd.c index ba8f52845b4e..fbbf703b5a2e 100644 --- a/lib/libc/gen/dirfd.c +++ b/lib/libc/gen/dirfd.c @@ -28,6 +28,7 @@ #include "namespace.h" #include +#include #include "un-namespace.h" #include "gen-private.h" @@ -35,5 +36,9 @@ int dirfd(DIR *dirp) { + if (dirp == NULL || _dirfd(dirp) < 0) { + errno = EINVAL; + return (-1); + } return (_dirfd(dirp)); }