From 1d2986ea15eab8ea8b8855147a16de7662729f31 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Thu, 20 Feb 2020 17:33:14 +0300 Subject: [PATCH] Kernel: Fix a panic in VFS::rename() If we get an -ENOENT when resolving the target because of some part, that is not the very last part, missing, we should just return the error instead of panicking later :^) To test: $ mkdir /tmp/foo/ $ mv /tmp/foo/ /tmp/bar/ Related to https://github.com/SerenityOS/serenity/issues/1253 --- Kernel/FileSystem/VirtualFileSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index 8405be4ce3e..f247757e674 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -433,7 +433,7 @@ KResult VFS::rename(StringView old_path, StringView new_path, Custody& base) RefPtr new_parent_custody; auto new_custody_or_error = resolve_path(new_path, base, &new_parent_custody); if (new_custody_or_error.is_error()) { - if (new_custody_or_error.error() != -ENOENT) + if (new_custody_or_error.error() != -ENOENT || !new_parent_custody) return new_custody_or_error.error(); }