From 159fa99539868db50162115b3155a12967e89555 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 3 Mar 2019 12:34:54 +0100 Subject: [PATCH] Kernel: No need to check is_superuser() after may_execute(). Since may_execute() incorporates a superuser check. :^) --- Kernel/VirtualFileSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/VirtualFileSystem.cpp b/Kernel/VirtualFileSystem.cpp index 4734a24cb8..9465699319 100644 --- a/Kernel/VirtualFileSystem.cpp +++ b/Kernel/VirtualFileSystem.cpp @@ -295,7 +295,7 @@ KResultOr> VFS::open_directory(const String& path, Inode& base) auto inode = inode_or_error.value(); if (!inode->is_directory()) return KResult(-ENOTDIR); - if (!inode->metadata().may_execute(*current) && !current->is_superuser()) + if (!inode->metadata().may_execute(*current)) return KResult(-EACCES); return Retained(*inode); } @@ -589,7 +589,7 @@ KResultOr VFS::resolve_path(const String& path, InodeIdentifier #endif return KResult(-ENOTDIR); } - if (!metadata.may_execute(*current) && !current->is_superuser()) + if (!metadata.may_execute(*current)) return KResult(-EACCES); auto parent = crumb_id; crumb_id = crumb_inode->lookup(part);