From e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Thu, 18 Jan 2024 00:55:05 +0200 Subject: [PATCH] msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index c17d9f785dc..726b1d8e5cb 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock;