From nobody Fri Jun 17 19:39:04 2022 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 8840485BBAF; Fri, 17 Jun 2022 19:39:05 +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 4LPq9P1W21z3QsZ; Fri, 17 Jun 2022 19:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494745; 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=s8INvOD0RsmCpe4HKvaBpJWlLPCm2wErkczIcs+Cr8c=; b=A5q/RLGhX7Mts4g4/8I2pmua4kmu3ewAdc0ywVf37dP9js57KDNKp3eExdn3c1XhV0PIJF phpOZhTLsKbtDNjNcsyMtDytde37v/6xVwzHX/dGb+5M5pILMJLXuwl8T/nQn+TC4m8toM lHpBBYurxB4LzhLhfcorELgCuTVvY+1e4iGdulrjtVuEDSQYa08UqtWPtbBfJDzyZ0vsO0 3R2FKTWFbXNqBS5CFrhsIeOJaxSugMWf66g7j9bLKR5Seou55YBrIpwzf3RkR//LsAKGO0 H2W1epub94jkbQ2F7OFR//Owsx3QdPa5i81VoedlLgl7FpDix0tOyDGOsNXiqQ== 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 EBC83259C5; Fri, 17 Jun 2022 19:39:04 +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 25HJd45I015529; Fri, 17 Jun 2022 19:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJd4WR015528; Fri, 17 Jun 2022 19:39:04 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:04 GMT Message-Id: <202206171939.25HJd4WR015528@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: 85575b7e0c7d - stable/13 - getdirentries: return ENOENT for unlinked but still open directory. 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: 85575b7e0c7d2e722559a44c2e246991eab2f2be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494745; 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=s8INvOD0RsmCpe4HKvaBpJWlLPCm2wErkczIcs+Cr8c=; b=Pps8aDP39MEzkWDJx7EiiaB1hk8QGmuss/VWuBJBThyein7XNcIRVfzOUw8vQUTJROb7RF jhKRIPRmrS8XfLtxr9/Cwu35KM4hXDvxATn0j1iNyMpuihq8oq4NTwLMSvDUYRwCjqGvvj 5wWMyY0XVvZzL759yuA+nzThbvDdxNAoKeQxLCb3AdE/0soveVZIT00r6sUnzH+E0wUSEq OcTamCqQFqjluhvsfPBQbt8G0T7ezk/K0D1iABWAqM8SkAj7Uo75XR8Ike71VUv0L3rdIl RJKh/NLLG7EJX8rJteUXjEidb4A9xm+twFHZrOM35e600IhtFVVwMUa9G/gKLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494745; a=rsa-sha256; cv=none; b=eVtJIrGszLoskHr+c+Jk+mgNtumyiT33NeBUtWHMAT2wlTZSjS1im6gWpR0BNmJo2E/lEb ItWfl+eoWqHXIzvIIZC1ru8QjldxwFf86hhwm3FytIj1sJVsF5iDpnp7sBmho2wKkITxHF RXoYwD1FGCDcWA6ql94hPDNOk1NhioSbSHywdRtuiFkczgrpRDapW4qIydq2U3nBBU71S5 +gHPu6SlxopA9bTNrChXglqTATM9q4nqCSOQQKXN0ATu75H6BMKFDlmYe3el3YOcp8+kLO 4gueq6X7yKQ9aMeQ6Blw1Ws1ZuAGzJhYOc8wEQ28NOc/DHUs6z0XGxjrdDL7Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=85575b7e0c7d2e722559a44c2e246991eab2f2be commit 85575b7e0c7d2e722559a44c2e246991eab2f2be Author: Dmitry Chagin AuthorDate: 2022-06-17 19:33:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:51 +0000 getdirentries: return ENOENT for unlinked but still open directory. To be more compatible to IEEE Std 1003.1-2008 (“POSIX.1”). Reviewed by: mjg, Pau Amma (doc) Differential revision: https://reviews.freebsd.org/D34680 MFC after: 2 weeks (cherry picked from commit c6487446d7e99537551d2e51a2f6c6569fcb89fc) --- lib/libc/sys/getdirentries.2 | 2 ++ sys/kern/vfs_subr.c | 1 + sys/kern/vfs_syscalls.c | 4 ++++ sys/sys/vnode.h | 1 + 4 files changed, 8 insertions(+) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 4185fb84f0f9..76fe18bf6edb 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -193,6 +193,8 @@ An error occurred while reading from or writing to the file system. .It Bq Er EINTEGRITY Corrupted data was detected while reading from the file system. +.It Bq Er ENOENT +Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 753e0062e808..ca2d86385f4c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6021,6 +6021,7 @@ vop_rmdir_post(void *ap, int rc) vn_seqc_write_end(dvp); vn_seqc_write_end(vp); if (!rc) { + vp->v_vflag |= VV_UNLINKED; VFS_KNOTE_LOCKED(dvp, NOTE_WRITE | NOTE_LINK); VFS_KNOTE_LOCKED(vp, NOTE_DELETE); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 276383fce2a0..b8f2bf4f695c 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4176,6 +4176,10 @@ unionread: error = EINVAL; goto fail; } + if (__predict_false((vp->v_vflag & VV_UNLINKED) != 0)) { + error = ENOENT; + goto fail; + } aiov.iov_base = buf; aiov.iov_len = count; auio.uio_iov = &aiov; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 92978eae8846..6d3e7eac8b23 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -272,6 +272,7 @@ struct xvnode { #define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */ #define VV_READLINK 0x2000 /* fdescfs linux vnode */ #define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */ +#define VV_UNLINKED 0x8000 /* unlinked but stil open directory */ #define VMP_LAZYLIST 0x0001 /* Vnode is on mnt's lazy list */