diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index 01db312c75b..8b52fbffec1 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -383,7 +383,8 @@ KResult VFS::mknod(StringView path, mode_t mode, dev_t dev, Custody& base) KResultOr> VFS::create(StringView path, int options, mode_t mode, Custody& parent_custody, Optional owner) { - auto result = validate_path_against_process_veil(path, options); + LexicalPath p(path); + auto result = validate_path_against_process_veil(String::formatted("{}/{}", parent_custody.absolute_path(), p.basename()), options); if (result.is_error()) return result; @@ -399,7 +400,6 @@ KResultOr> VFS::create(StringView path, int optio if (parent_custody.is_readonly()) return EROFS; - LexicalPath p(path); dbgln("VFS::create: '{}' in {}", p.basename(), parent_inode.identifier()); uid_t uid = owner.has_value() ? owner.value().uid : current_process->euid(); gid_t gid = owner.has_value() ? owner.value().gid : current_process->egid(); @@ -1031,6 +1031,10 @@ KResultOr> VFS::resolve_path_without_veil(StringView path if (!safe_to_follow_symlink(*child_inode, parent_metadata)) return EACCES; + auto result = validate_path_against_process_veil(custody->absolute_path(), options); + if (result.is_error()) + return result; + auto symlink_target = child_inode->resolve_as_link(parent, out_parent, options, symlink_recursion_level + 1); if (symlink_target.is_error() || !have_more_parts) return symlink_target; diff --git a/Userland/Tests/Kernel/unveil-symlinks.cpp b/Userland/Tests/Kernel/unveil-symlinks.cpp new file mode 100644 index 00000000000..75e514360ef --- /dev/null +++ b/Userland/Tests/Kernel/unveil-symlinks.cpp @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2020, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +int main() +{ + rmdir("/tmp/foo/1"); + rmdir("/tmp/foo"); + unlink("/tmp/bar"); + + if (mkdir("/tmp/foo", 0755) < 0) { + perror("mkdir"); + return 1; + } + + if (mkdir("/tmp/foo/1", 0755) < 0) { + perror("mkdir"); + return 1; + } + + if (symlink("/tmp/foo", "/tmp/bar")) { + perror("symlink"); + return 1; + } + + if (unveil("/tmp/foo", "r") < 0) { + perror("unveil"); + return 1; + } + + if (unveil(nullptr, nullptr) < 0) { + perror("unveil"); + return 1; + } + + int fd = open("/tmp/foo/1", O_RDONLY); + if (fd < 0) { + perror("open"); + return 1; + } + close(fd); + + fd = open("/tmp/bar/1", O_RDONLY); + if (fd >= 0) { + fprintf(stderr, "FAIL, symlink was not unveiled\n"); + return 1; + } + + if (chdir("/tmp")) { + perror("chdir"); + return 1; + } + + fd = open("./foo/1", O_RDONLY); + if (fd < 0) { + perror("open"); + return 1; + } + close(fd); + + fd = open("./bar/1", O_RDONLY); + if (fd >= 0) { + fprintf(stderr, "FAIL, symlink was not unveiled\n"); + return 1; + } + + printf("PASS\n"); + return 0; +}