apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

kernel: Honor the sticky bit

Browse Source
This commit is contained in:
apio 2023-06-03 11:55:10 +02:00
parent 89d7866abb
commit 1090815c8d
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/src/fs/VFS.cpp
View File

@ -168,6 +168,11 @@ namespace VFS
return inode->mode() & S_ISGID; return inode->mode() & S_ISGID;
} }
bool is_sticky(SharedPtr<Inode> inode)
{
return inode->mode() & S_ISVTX;
}
bool is_seekable(SharedPtr<Inode> inode) bool is_seekable(SharedPtr<Inode> inode)
{ {
return inode->type() != InodeType::FIFO && inode->type() != InodeType::CharacterDevice; return inode->type() != InodeType::FIFO && inode->type() != InodeType::CharacterDevice;

1
kernel/src/fs/VFS.h
View File

@ -290,6 +290,7 @@ namespace VFS
bool can_write(SharedPtr<Inode> inode, Credentials auth); bool can_write(SharedPtr<Inode> inode, Credentials auth);
bool is_setuid(SharedPtr<Inode> inode); bool is_setuid(SharedPtr<Inode> inode);
bool is_setgid(SharedPtr<Inode> inode); bool is_setgid(SharedPtr<Inode> inode);
bool is_sticky(SharedPtr<Inode> inode);
bool is_seekable(SharedPtr<Inode> inode); bool is_seekable(SharedPtr<Inode> inode);

11
kernel/src/sys/link.cpp
View File

@ -25,11 +25,12 @@ Result<u64> sys_unlinkat(Registers*, SyscallArgs args)
auto inode = TRY(current->resolve_atfile(dirfd, dirname, false, false)); auto inode = TRY(current->resolve_atfile(dirfd, dirname, false, false));
if (!VFS::can_write(inode, current->auth)) return err(EACCES); if (!VFS::can_write(inode, current->auth)) return err(EACCES);
if (flags > 0) auto child = TRY(inode->find(basename.chars()));
{ if (flags == AT_REMOVEDIR && child->type() != VFS::InodeType::Directory) return err(ENOTDIR);
auto child = TRY(inode->find(basename.chars()));
if (child->type() != VFS::InodeType::Directory) return err(ENOTDIR); if (current->auth.euid != 0 && VFS::is_sticky(inode) && current->auth.euid != inode->uid() &&
} current->auth.euid != child->uid())
return err(EACCES);
TRY(inode->remove_entry(basename.chars())); TRY(inode->remove_entry(basename.chars()));