From nobody Wed Feb 21 13:31:49 2024 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 4TfxyG2x1zz5CBn2; Wed, 21 Feb 2024 13:31:50 +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 4TfxyG0Dwzz4Zhy; Wed, 21 Feb 2024 13:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708522310; 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=Xxs7Fro/hGm2PZHLOrVC7TUAfgab9E4DJQuycfSC3rw=; b=re2vKm0AX4nsy6iowaH5q89i9wkQwLQjbl2s3yCw3rlzjLSh6z1a4hTMIiJHY3ahuVoa5n fVqMO3GG+iuobRCdgb1wc52QpOXPBxiAF7Ang/A7z6PjMuPKDn6/VNzNUM6ViMtX1ESqDj TldNqw+QBk/txupp3018f1HVDp4DAnAzAoYk28iaMTcoOsTqanNn999yo++gDUdXgN9Pnu gWB9MLUzd3XDo68ExSHqddbR95byRzQvML+AKuP7qcYLoNSG0IQeodJ3g61vtpzk1xP7/B zzujJI1VZJDvqoHT744LCtY0OPoJ6JePMzkTZTXbIpbsFTq7gFipNQcWEJedRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708522310; 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=Xxs7Fro/hGm2PZHLOrVC7TUAfgab9E4DJQuycfSC3rw=; b=m718Lhlovw7JfiNVw5AKF7nPdBikG3nCohVQewdEsDHHNlwKhmyp4WNJ4hXJN1OwoT5h1R d4KgdjH1k0vSBAZ5N9KQewE48pWxNAByOyRcK5s/gaEppu9FmkuauYd3NbotS14E29LxaW 5ALb6HeWMWiZWqaAHP9VE6uxZT8XXimqr7lv7N9c6TjrtDTsF44t49cOwkqX5SjSlJa2qz XbZtMRIPoTJZ6Cf/uP4F3qaHZyyFa470pEGizJCgbJsprFQxURl49cFQiuwC1/Pc0Wpm+V OdSoraVH/7VWvLuDAmqSy0/dv7g4v+Zml2vMNWdOMkP7unlRNSOdTZPjOLZN0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708522310; a=rsa-sha256; cv=none; b=Kdh3rkbSP3E+7BK7x2UDmFvdVcjDvhfPHIlbj0+MFQEVsS/x4JatUsX/yehgG1Wt7T2RHi JTvLI8y7akkfr45s1coF3J+Qb+FSA6ehWQGoounKnNxdvDp09JmJ6AUN4wQ7nBr8CG+y3w Lu/MwNrm0PmneD3KIMuuRBhOBhm+30a+4TeQAGcZegFY+xvLQt5SxBxGoUU5hSuhBUUagn DconsTTCbVQQ4qn6jz5zkpCcq0rQrR8naYNoDq76harctZwf5e7Rmjd0QRQq7Kvt41EzK3 BKjq3qWbKrS2Aey34Q/Gubr9toTyzm61isCxmkyanbey32GOn/uUvaQcPk60sQ== 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 4TfxyF6QJ2z14VR; Wed, 21 Feb 2024 13:31:49 +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 41LDVngq026014; Wed, 21 Feb 2024 13:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LDVnL4026011; Wed, 21 Feb 2024 13:31:49 GMT (envelope-from git) Date: Wed, 21 Feb 2024 13:31:49 GMT Message-Id: <202402211331.41LDVnL4026011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 00c958f12c3d - releng/13.3 - msdosfs: fix directory corruption after rename operation 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 00c958f12c3da158fe79c6976337eee870714fa3 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=00c958f12c3da158fe79c6976337eee870714fa3 commit 00c958f12c3da158fe79c6976337eee870714fa3 Author: Stefan Eßer AuthorDate: 2024-02-17 21:04:49 +0000 Commit: Stefan Eßer CommitDate: 2024-02-21 13:31:26 +0000 msdosfs: fix directory corruption after rename operation PR: 268005 Reviewed by: mckusick Approved by: re (cperciva) (cherry picked from commit 8b67c670a49b4efe7e1557121b5bbae682ea3bc7) (cherry picked from commit 5f4753501e9cc59e0d15f849c9459478ea5c8dc7) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 1d296c019331..7d18ac623af4 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1192,8 +1192,10 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - if (error == EJUSTRETURN) + if (error == EJUSTRETURN) { + tdip->de_fndoffset = to_diroffset; error = createde(fip, tdip, NULL, tcnp); + } if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock;