From nobody Thu Feb 5 15:26:56 2026 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 4f6Lg459RKz6QkvW for ; Thu, 05 Feb 2026 15:26:56 +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 4f6Lg42wwzz3WPY for ; Thu, 05 Feb 2026 15:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305216; 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=q6qSesjOxhBb7IIxsVJD9tn8k79HxD7zn9YC8wsppqY=; b=r4RApD+cr2CeVQq90JHHiriHWS2IQrTJUq+Vd6HCniT8Q7P1Ioz8c3mu58za4DK246YyQp cKBQg/JpuAssEjwXPiV/29+mZk4mNyHrG6uRUWgKOaRCuDiRVx+BCfQ5tskn1Ch6BHZj7f mDI90agH7rOwIMjV8MxgjTiuHuKFYabQEgmfnQ3Gy6pvvE7NzIbLKzMfnpjI6l+kMEr/5c 5BIjG30C926UXgzvjtwuf6YBCefeuS9tTrChOy2IDPHPKW8IGKONbtTDfPuSHMjpcKqie2 yoSgHsbq9eVyv08Gb6p5jmt3YMvLeOrMKMmRjCkkNBUCNMB2dy6Q1xXrMUcmQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305216; a=rsa-sha256; cv=none; b=B6Kko1A3SK1kyXGfD5/JELRlC+Zndvl36KQ94TVTVrqBSQ72J4D7+enhrpDxIrsFpGe9ZN UxQ4mPN+AqAbO1TTiXeiySxupQ4rT0aYGK8nayx+EP185mxcARQHovFw5pOr0jCrJK/2cX vIo9Q2vQGHp47UZPqvjhMlZR30HyVOEqMeEHEgTMUHN1LtUt7xkNlEUiSUENY0uzopchk9 p+fp53Ki9e02AP6bgWJSpjJIJrF2qkaboD8HKeT4S3zQWBJlzlvFmPuDhFDwxhY6mE85Jy DuqCIMkijIhYrp08ZzPf90r23ZLJjV3Z3Ja65WSB0nXAex5J6efdAHM5uz8W0w== 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=1770305216; 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=q6qSesjOxhBb7IIxsVJD9tn8k79HxD7zn9YC8wsppqY=; b=SMeFoDjUbl1W5OkuJP+zDHmeGAtF2RQEKPNcUK8uGjorejp1P/+TTnuCOH9fWYBVHVBWyN 748Mnes4WN2wrpwjESnhCRWSWhLYW4D7GM/8nMTDSY1tBNhHbZgYb0/QT5kCpqJI6Y+TzP RfNBw/dpapDivhGMjqsl6PwKa1YDIYc4ZnVhTq3p0pGJX7cVFurrjMvD1Ov/VBzt4JdtFu hPoQcRAGG/55hw9Hfqw+fIXCiNaqIugrqOICtad6njQqoPPmSW0BgnA2uibnxXGffkuvgh Qukbo3c8ytX08zm4NpiQInCRvVfXFQ8Vaif1AyPWwxGwS+CPwCGB1kKzzcZw0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lg42VHDzZwT for ; Thu, 05 Feb 2026 15:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fcb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:26:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 6ff3a186c5b8 - stable/15 - libc: Improve POSIX conformance of dirfd() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ff3a186c5b8a67c597dc57081077972eccf7c87 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:26:56 +0000 Message-Id: <6984b6c0.3fcb6.4f1cac59@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6ff3a186c5b8a67c597dc57081077972eccf7c87 commit 6ff3a186c5b8a67c597dc57081077972eccf7c87 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-02 15:46:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:50:19 +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 (cherry picked from commit 5074d5c9845e142883cdbb9ad212be66e57615d0) --- 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)); }