From nobody Sat Jul 11 22:05:22 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 4gyN6w2HYXz6lhLb for ; Sat, 11 Jul 2026 22:05:28 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gyN6v67q8z3x6H for ; Sat, 11 Jul 2026 22:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783807527; 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=R4gfh12lmBxBCXuJvA0k232grHqrwpjoQZFobwfzW5U=; b=d7g+2C3Kp0tnwa9R3wzFGJsQMMI3+ZCbcMEXQS2ryNl5ya6lTk+prlPOV9J5UDkRXJ1/u8 Tf/1bMoC/zMbx1kwZr+fyLDHDWvZ3HtL+9kMcjjIUjGnP8QD0zK1wo25h8jutz8qSWZ8T5 vjOHbVmPjHqbPu+i876ut6akPnCcHhHlm2l3jeW0lNgZSw9eIEiX+WMN6TpLCHfSLf5aMP iLxoOQdKpZms64CY0TrdyluiK7hw0IWyV1giiK/5H4lIy7OP4FkF2Xtg45Uen5M6LtFoyl 4Eq5tw7qb4BO6jYLxq6n1ESlX79qJViLJPOfTEiKqVnLTi23sOxiiyiD5wOVFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783807527; a=rsa-sha256; cv=none; b=r2og+BmegaYTTWFRKj17izWMLQPGT+Zof1Ykav6H84Ea8f8tyH6UnNjWLa7qzGAGtRUEcN tpG49yMTbAQm3WU5P5hgoTyswUD72fla/cxvbX6Xi6A4zbx5hP5tLI//PJwlnScH/rXp8d zcN/jaXm3VrnuCxZECAeoC/AwocCLcpuiC/1LpglAURu3qCaVPvgCEgqL5Q9Fa1yGkJIqs /pFzha6g7LNTaO5nL/fvLMMQmKyaJyvr8qjylDW/Hn1+fg+PyXJPOt0hYevmJEuMnje6On /R+WrWRI8pyMIFyCMNb+GM76xqgiEifqp5yBveODq8JLtV3VopLQPwo/3i6TbQ== 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=1783807527; 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=R4gfh12lmBxBCXuJvA0k232grHqrwpjoQZFobwfzW5U=; b=InXxjdS2Dgwyxv2Lb3MFUBoUFpikreyM8dlzm8tEixfk0uZzPVmkwy3VSjarkZaupxbOTT SREFkv0BgQxMEwhn+NMSi/WQxyMYH1WRcpM7aeZE/q4XeGnzZq+OxqQeh+5Rm9TVhBrhnU 3HNrfsDFjTrHsGumSIRWNM9eVJkj+hAOwdeSv7hNRilMWA6wJ2hmm3nz/qRP4JoNxuB1fq c5TQt0ay/Takw6o13xv1x7nmm7rnWQ+UwKYociwZ6g4Uw/odzLZ6UA6Js06s/UGFQX+lrz tLXGib9uwYCKPKIKpYK/uaA6Jmy5iqy2bm0Ozxm6z4v4ATslagNC8KF4U7FXug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gyN6v4xB4z10By for ; Sat, 11 Jul 2026 22:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Jul 2026 22:05:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8e6e77ec25bc - main - renameat(2): add AT_RENAME_EXCHANGE 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 8e6e77ec25bc5809500d29bf318a843b40205657 Auto-Submitted: auto-generated Date: Sat, 11 Jul 2026 22:05:22 +0000 Message-Id: <6a52be22.3f0ce.6d0e691e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8e6e77ec25bc5809500d29bf318a843b40205657 commit 8e6e77ec25bc5809500d29bf318a843b40205657 Author: Konstantin Belousov AuthorDate: 2026-06-18 18:12:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-11 22:04:43 +0000 renameat(2): add AT_RENAME_EXCHANGE flag Currently no filesystems support it. Reviewed by: mckusick Discussed with: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57658 --- sys/kern/vfs_syscalls.c | 70 ++++++++++++++++++++++++++++++++++++++++--------- sys/sys/fcntl.h | 2 ++ 2 files changed, 59 insertions(+), 13 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 59d0c9c40927..29d503bbb3fa 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3752,12 +3752,13 @@ sys_renameat2(struct thread *td, struct renameat2_args *uap) #ifdef MAC static int kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, - const char *new, enum uio_seg pathseg, struct nameidata *fromnd) + const char *new, enum uio_seg pathseg, struct nameidata *fromnd, int op, + int ndflags) { int error; - NDINIT_ATRIGHTS(fromnd, DELETE, LOCKPARENT | LOCKLEAF | AUDITVNODE1, - pathseg, old, oldfd, &cap_renameat_source_rights); + NDINIT_ATRIGHTS(fromnd, op, LOCKPARENT | LOCKLEAF | AUDITVNODE1 | + ndflags, pathseg, old, oldfd, &cap_renameat_source_rights); if ((error = namei(fromnd)) != 0) return (error); error = mac_vnode_check_rename_from(td->td_ucred, fromnd->ni_dvp, @@ -3782,23 +3783,35 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, struct vnode *tvp, *fvp, *tdvp; struct nameidata fromnd, tond; uint64_t tondflags; - int error; + int error, fndflags, op; short irflag; + bool exchange; - if ((flags & ~(AT_RENAME_NOREPLACE)) != 0) + if ((flags & ~(AT_RENAME_NOREPLACE | AT_RENAME_EXCHANGE)) != 0) + return (EINVAL); + if ((flags & (AT_RENAME_NOREPLACE | AT_RENAME_EXCHANGE)) == + (AT_RENAME_NOREPLACE | AT_RENAME_EXCHANGE)) return (EINVAL); + if ((flags & AT_RENAME_EXCHANGE) != 0) { + op = RENAME; + exchange = true; + } else { + op = DELETE; + exchange = false; + } + fndflags = 0; again: tmp = mp = NULL; bwillwrite(); #ifdef MAC if (mac_vnode_check_rename_from_enabled()) { error = kern_renameat_mac(td, oldfd, old, newfd, new, pathseg, - &fromnd); + &fromnd, op, fndflags); if (error != 0) return (error); } else { #endif - NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | AUDITVNODE1, + NDINIT_ATRIGHTS(&fromnd, op, WANTPARENT | AUDITVNODE1 | fndflags, pathseg, old, oldfd, &cap_renameat_source_rights); if ((error = namei(&fromnd)) != 0) return (error); @@ -3806,6 +3819,11 @@ again: } #endif fvp = fromnd.ni_vp; + if (exchange && fvp == NULL) { + NDFREE_PNBUF(&fromnd); + vrele(fromnd.ni_dvp); + return (ENOENT); + } tondflags = LOCKPARENT | LOCKLEAF | NOCACHE | AUDITVNODE2; if (fromnd.ni_vp->v_type == VDIR) tondflags |= WILLBEDIR; @@ -3844,6 +3862,29 @@ again: error = EEXIST; goto out; } + if (exchange) { + if (tvp == NULL) { + error = ENOENT; + goto out; + } + if (tvp->v_type == VDIR && fndflags == 0) { + fndflags = WILLBEDIR; +again2: + NDFREE_PNBUF(&fromnd); + vrele(fromnd.ni_dvp); + vrele(fvp); + NDFREE_PNBUF(&tond); + VOP_VPUT_PAIR(tdvp, &tvp, true); + error = sig_intr(); + if (error != 0) + goto out1; + goto again; + } + if (tvp->v_type != VDIR && fndflags != 0) { + fndflags = 0; + goto again2; + } + } error = vn_start_write(fvp, &mp, V_NOWAIT); if (error != 0) { again1: @@ -3886,12 +3927,15 @@ again1: goto out; } if (tvp != NULL) { - if (fvp->v_type == VDIR && tvp->v_type != VDIR) { - error = ENOTDIR; - goto out; - } else if (fvp->v_type != VDIR && tvp->v_type == VDIR) { - error = EISDIR; - goto out; + if (!exchange) { + if (fvp->v_type == VDIR && tvp->v_type != VDIR) { + error = ENOTDIR; + goto out; + } else if (fvp->v_type != VDIR && + tvp->v_type == VDIR) { + error = EISDIR; + goto out; + } } #ifdef CAPABILITIES if (newfd != AT_FDCWD && (tond.ni_resflags & NIRES_ABS) == 0) { diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 80cbca4ea753..44f43f745762 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -260,7 +260,9 @@ typedef __pid_t pid_t; #define AT_EMPTY_PATH 0x4000 /* Operate on dirfd if path is empty */ #define AT_RENAME_NOREPLACE 0x0001 /* Fail rename if target exists */ +#define AT_RENAME_EXCHANGE 0x0002 /* Atomically exchange 'from' and 'to' */ #define RENAME_NOREPLACE AT_RENAME_NOREPLACE +#define RENAME_EXCHANGE AT_RENAME_EXCHANGE #endif /* __BSD_VISIBLE */ /*