From nobody Tue Mar 10 11:43:40 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 4fVX8D5hvbz6VVsQ for ; Tue, 10 Mar 2026 11:43:40 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8D2MNmz49Xn for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143020; 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=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=lTQzWz12JhxKW68gE+2AeJ3J6wrLoyrHVg80c/zFS8pE6de6uux1UqQpfHmaRJVkoAoyUU KGqaSPNuWvMFUY9hDaJXZutCDk9LvebKlaYKLF6qR81tOCfwdHm1lJ0VOJhqIqWvlg+zvl UIemc+Ds71Owa5nkk72D526wOXp16HK6QtZL6Q6vnK0oLDeYmIus0C4p2gzhZSpWEqhP8X EsSdkvC95XJARs1jzqYo8caC7/UVAq5fsmB/lOfjDdlBxvfH2VoImwJnoZolfFNG158Dlo rkYoKryBNJKrTV8BPkq2tsv+s6KMV+JT4j0E1HL+AHi0mB9EYzItY2sC+W3B9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143020; a=rsa-sha256; cv=none; b=PonnQT3Ox2ji4fNVTLm9L65LBFGJInh0wO8/zJANxE6QcneqgGwywCygyiAc1ktJrQaHAz R9nHI5UlXcyvCqO+k7kgDfA+HpM+LkVBJB2fNqr1bvHzAjK6fLDbUSSUQyb7pigDmN3miU DJDCKEk6J5mxtjpU5ydpsIXap69FYmUusWrZDZMaf2v34r7dwh5YIyD43EeLyGewGlHPyc UiJT+oZRdSmn6WFUm9GX0BCLOwBAYOgjUzlTiZniCoOFeS03buLVk3OAimIEV+i9xtm01k qyarH5ctvxfGJWUjUiSFgOP+L1cD8aRN8gn3lnCiPuXRDRgl7f6fWae0lYRVtQ== 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=1773143020; 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=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=aKyvyq4kqzFS0+JGvEjxuhN9MXaeg5gb5Qjjli8o+5VVKJGV4qmuHtEIoVjmW5THwRVN0i naNLvyv6sI/MMx8oc9bAFBYHwG9uji+UEMZ1maWyOIfw+ZG6/LwjlaZo/XmIoiFwvQ7Hqy mmRIZNKE7vhbFRZw3JAjO4VvghlP0GWFB1FyFVwRVb8BbriiQ9Csf98T77XpEXq92qQ1Ij eNpkeAWf4smZyQ2a9NEhMs+F4CA+PnSV6O5pSq0UigfiC8DqiSsBREqrcrPJ3hDQ0YuA76 NSOCjvPIDzcMdYiIfduAWVByu45JSA7Hh6+nUtfWpkGE+fzNfQ3IfpeJD+JzIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8D1yYjz19L3 for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d109 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9c37c82f526c - stable/15 - renameat2(2): implement AT_RENAME_NOREPLACE flag 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c37c82f526cc6f70e775e52f1e537d23202dd35 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:40 +0000 Message-Id: <69b003ec.1d109.3f2bbf2e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c37c82f526cc6f70e775e52f1e537d23202dd35 commit 9c37c82f526cc6f70e775e52f1e537d23202dd35 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:57:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 renameat2(2): implement AT_RENAME_NOREPLACE flag (cherry picked from commit 7aaec5f3faecf98e377c97e24dddb9c65f4b2e75) --- sys/fs/msdosfs/msdosfs_vnops.c | 9 +++++++-- sys/fs/tmpfs/tmpfs_vnops.c | 9 +++++++-- sys/kern/vfs_syscalls.c | 24 ++++++++++++++++++++---- sys/sys/fcntl.h | 3 +++ sys/ufs/ufs/ufs_vnops.c | 7 ++++++- 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3e28a7ce9d05..d626aed28076 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -49,12 +49,12 @@ * October 1992 */ -#include #include #include #include #include #include +#include #include #include #include @@ -970,7 +970,7 @@ msdosfs_rename(struct vop_rename_args *ap) goto abortit; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto abortit; } @@ -1041,6 +1041,11 @@ relock: vrele(tvp); tvp = NULL; } + if (error == 0 && tvp != NULL && + (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlock; + } if (error == 0) { nip = NULL; error = deget(pmp, scn, blkoff, LK_EXCLUSIVE | LK_NOWAIT, diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 5596f8794546..edd620cfdb5b 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -993,7 +993,7 @@ tmpfs_rename(struct vop_rename_args *v) goto out; } - if (v->a_flags != 0) { + if ((v->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto out; } @@ -1018,9 +1018,14 @@ tmpfs_rename(struct vop_rename_args *v) "tmpfs_rename: fdvp not locked"); ASSERT_VOP_ELOCKED(tdvp, "tmpfs_rename: tdvp not locked"); - if (tvp != NULL) + if (tvp != NULL) { ASSERT_VOP_ELOCKED(tvp, "tmpfs_rename: tvp not locked"); + if ((v->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto out_locked; + } + } if (fvp == tvp) { error = 0; goto out_locked; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index fdd215f1c9f9..92b43672bae0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3783,7 +3783,7 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, int error; short irflag; - if (flags != 0) + if ((flags & ~(AT_RENAME_NOREPLACE)) != 0) return (EINVAL); again: tmp = mp = NULL; @@ -3820,6 +3820,19 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; + if (tvp != NULL && (flags & AT_RENAME_NOREPLACE) != 0) { + /* + * Often filesystems need to relock the vnodes in + * VOP_RENAME(), which opens a window for invalidation + * of this check. Then, not all filesystems might + * implement AT_RENAME_NOREPLACE. This leads to + * situation where sometimes EOPNOTSUPP might be + * returned from the VOP due to race, while most of + * the time this check works. + */ + error = EEXIST; + goto out; + } error = vn_start_write(fvp, &mp, V_NOWAIT); if (error != 0) { again1: @@ -3912,9 +3925,12 @@ out: vrele(fromnd.ni_dvp); vrele(fvp); } - lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); - vfs_rel(tmp); - vn_finished_write(mp); + if (tmp != NULL) { + lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); + vfs_rel(tmp); + } + if (mp != NULL) + vn_finished_write(mp); out1: if (error == ERESTART) return (0); diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 18d3928e91c7..8f2fc1e2debb 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -245,6 +245,9 @@ typedef __pid_t pid_t; #define AT_RESOLVE_BENEATH 0x2000 /* Do not allow name resolution to walk out of dirfd */ #define AT_EMPTY_PATH 0x4000 /* Operate on dirfd if path is empty */ + +#define AT_RENAME_NOREPLACE 0x0001 /* Fail rename if target exists */ +#define RENAME_NOREPLACE AT_RENAME_NOREPLACE #endif /* __BSD_VISIBLE */ /* diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 429e6b5c8dd7..4abbd4ee807f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1294,7 +1294,7 @@ ufs_rename( goto releout; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; mp = NULL; goto releout; @@ -1394,6 +1394,11 @@ relock: } } + if (tvp != NULL && (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlockout; + } + if (DOINGSUJ(fdvp) && (seqc_in_modify(fdvp_s) || !vn_seqc_consistent(fdvp, fdvp_s) || seqc_in_modify(fvp_s) || !vn_seqc_consistent(fvp, fvp_s) ||