From nobody Tue Feb 20 21:48:55 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 4TfY2H2Jf7z59hvP; Tue, 20 Feb 2024 21:48:55 +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 4TfY2H1lNJz4rKD; Tue, 20 Feb 2024 21:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708465735; 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=1k68At+J6QkYHjnzEiGzg7fWw05IL/IJEJCBabgzkzA=; b=UpqzguDSyfMoBg27gIdUtg3V0RDLbFPIHc0BWF1ckWy4Bhe3dqQQuftNIRT6fY5ZSiw+Gr SJB1w4fcdTap0+vebb4ZANOal0Z7iiYJKErkb3rrOmMxyZR6QizKXrjlKA1+RzYpEmoQsg hvTGS8IKquHEZMQfKvH/LZLnRVsAPwWDHJep6jGIqnilaAOWrntNp2latyn5u30BOhgbPM Fj/R+ShFpe2F/ExrbfEmZZAzTpee5Ie+zOVzwetOs42tJtMF7UXqO7PrANwuytejJxm0EV vPoROqTYDlfUIg6qQ58i9TeJ53SBQ++RCBta5LRLuNZIyNh6MkWJJCkRdVU1nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708465735; 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=1k68At+J6QkYHjnzEiGzg7fWw05IL/IJEJCBabgzkzA=; b=VN54xhKTSXSzPp+7lDFl4Tlaz4Rzxh2UufS8/L9Wzc7NG9uJU362TkS4YKizUI0v9z1056 qHbLavQDo/CxqLjF/KGRJulW7XZWy/po4mJwsFjgxJiDxNel3hHxLrUraM0GcSEBTbJrA6 4Of/ybOwLO/Ux4ymE2PjQZ5tpo2hLL/HXTWVztU55XqNCZMYdNbSb5nYvtxilacgjCOPLb yph6iwB3CYOb7PR7BiVoAblRp7sni4W+1Mp/ZZGscwjWYKQGppjjzHeX5ZnPOBnOTshsYc gdbf8q4TzAxQ1uF1KhLwuDiWqXRzwOH+BcnwBZS1h9f28ESisk9XpQqT0NB3LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708465735; a=rsa-sha256; cv=none; b=Cbv4AFQoU0cHOmYBqYbQhiiwyv/1WwH43qwHC7zImrJVcpfK+mnSjAPza3WPtAh+aJnJoi ZDkQyd4Xq20q3FkqReCRluWHlUPq6x3t42E8FXBB7XZl/HIEQ8xPpzWeKePi2DipZSdFKp 8M86SqxBxwH22XrrXlwNco5l8YImPJhYQ1uZyQqmijzb8ET7j6kaBpzgADRh16Crho+taQ 9NLI0mLZzYabH9U3qd3uURK5HMfR2M52APwy93nuBN9moH2G/uurwJ9XJHsnnxf+wwOpyN ij2DXz28rYVos1VFvCxkr5ussKOp/dbseBg9/Xl3qEx3P9ZW80ngoiMZhGwZZg== 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 4TfY2H0q2Pzc0v; Tue, 20 Feb 2024 21:48:55 +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 41KLmt6N029579; Tue, 20 Feb 2024 21:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KLmt9Y029576; Tue, 20 Feb 2024 21:48:55 GMT (envelope-from git) Date: Tue, 20 Feb 2024 21:48:55 GMT Message-Id: <202402202148.41KLmt9Y029576@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: 5f41ed8d0978 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f41ed8d0978ec9760c901958aec77f2acd803ec Auto-Submitted: auto-generated The branch stable/14 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=5f41ed8d0978ec9760c901958aec77f2acd803ec commit 5f41ed8d0978ec9760c901958aec77f2acd803ec Author: Stefan Eßer AuthorDate: 2024-02-17 21:04:49 +0000 Commit: Stefan Eßer CommitDate: 2024-02-20 21:48:08 +0000 msdosfs: fix directory corruption after rename operation (cherry picked from commit 8b67c670a49b4efe7e1557121b5bbae682ea3bc7) --- 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 31d9b003a6fa..078ea5e52312 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,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;