From nobody Thu Jun 29 08:20:29 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 4QsBGQ2ngDz4knpM; Thu, 29 Jun 2023 08:20:30 +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 4QsBGQ1dvMz3vcW; Thu, 29 Jun 2023 08:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026830; 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=OhC5bTfoGAzDh3MgRtXCcQr0Q0+0bIfJYaZLEtDf8gI=; b=v8UjzMmRt3zePrQqCSEcuLh+UnCoKFDOJEHdZGdbxCmHplKL09S9Z1B8ILHkIyFDDA0v3+ WhfvVz9kw0DAHtPsuVHxtky2hmtyqDZ+0IFe69fC2EQWjj7uPRoJm+zxKbBgpINIwN9LqS zlUvTMrpibi5B49AsvljBoGvzCFSRy1zYRKLFlDSfuFcxJCQ6rVTOfCHoO+MC3UNafDagL el5sS/oIgUHykRBK2vhsWWBmHcg2NqZ8g0sR5+HOq9MC95PnJma01jdsBpjqBUwoWAL84N hjZ3ddE1uxHnfnMfyUrKc6MsGjAP5SoGhkjISuV/r6oyuvrRkKngeDca7287Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026830; 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=OhC5bTfoGAzDh3MgRtXCcQr0Q0+0bIfJYaZLEtDf8gI=; b=Cch/JVE9UVX1Tid9IAaKDxf99YEJpSjSZQFO/uZ2EVbEsWlhkRJa1Pj71PMJMssRbBC3L/ r+bIHxYuu7w/Z4Qe61SmoofbQ98rbTzevOhBof+VXlVHdTWnRkP4N2uB3kE5ArWsGWrRc0 +ei6JnZIWkBmWqZ41OUEe1lJxP+gLLtSndUVuAPZNiVyglo1xEtk49wWYpO9b45vi5gARx ET3xl4Xc+AoY6KVgBQ2NUMdJoC285GNu586W7ju53NaP+Wg3OItX9f3F4KmYNpWla1GvOc kBLqBu4gOG4ggIqqk73xqkyrFX9WJoteUP2PtpzPUoN9fKwBUhVN+zvGyXG0Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026830; a=rsa-sha256; cv=none; b=eEX3qyBe+y9JY8hXwyNGOKonXpJ5hKUdt6O8fnQNjjgo9ssEZScekc9o+w+ZPTbnM8diEM fr+khqAFffcL+ZPYt0jTaIQXbYMnmfLNxjjIVMjrfAtKXG44wrlpzxOY4RPpd5SFhEzji4 MfB2Y6rPifjiVg1267rVmCwJovctZRWCn5BBviQFP20OrWfOqoXSJ+VfL4a7rZCAkZghZo HuT72Z7GvV4ClAyPSlIIgwt43/E3pOzClx65ecr8g3cRCQN1o0k/eGyEZbS0gVsbV0obb1 UAPpmE9+vtNapIDjZDklFKErF93zVn5pjVquz4+PFcQjqceo99AXPVaqR/t6cA== 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 4QsBGQ0Ykfz17sY; Thu, 29 Jun 2023 08:20:30 +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 35T8KTWZ083522; Thu, 29 Jun 2023 08:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KTji083521; Thu, 29 Jun 2023 08:20:29 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:29 GMT Message-Id: <202306290820.35T8KTji083521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4d1134a54c85 - stable/13 - fstatat(2): restore AT_EMPTY_PATH handling 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d1134a54c85ae8926eb43b7e51aee6e65b71816 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4d1134a54c85ae8926eb43b7e51aee6e65b71816 commit 4d1134a54c85ae8926eb43b7e51aee6e65b71816 Author: Konstantin Belousov AuthorDate: 2023-05-02 15:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:50 +0000 fstatat(2): restore AT_EMPTY_PATH handling Fixes: cb858340dcbf214cc4c4d78dbb741620d7b3a252 Reported by: markj Sponsored by: The FreeBSD Foundation (cherry picked from commit a1d71cebc05ccfeedf95f2db3e94b17270167888) --- sys/kern/vfs_syscalls.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 89f45e898d8e..7f7836450811 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2432,8 +2432,12 @@ kern_statat(struct thread *td, int flag, int fd, const char *path, AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH) | LOCKSHARED | LOCKLEAF | AUDITVNODE1, pathseg, path, fd, &cap_fstat_rights, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(&nd)) != 0) { + if (error == ENOTDIR && + (nd.ni_resflags & NIRES_EMPTYPATH) != 0) + error = kern_fstat(td, fd, sbp); return (error); + } error = VOP_STAT(nd.ni_vp, sbp, td->td_ucred, NOCRED, td); NDFREE_NOTHING(&nd); vput(nd.ni_vp);