diff options
author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2021-10-30 00:45:23 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-10-31 12:06:28 +0100 |
commit | c05c5a7ff43388994a85ce84121cdcfa6ee741ba (patch) | |
tree | a255c368c51cf8cab2f005d6bc9a8dcc1b33d641 /Kernel/FileSystem/FIFO.cpp | |
parent | 88ca12f037ffd9aedc884331c927f08d57e047cd (diff) | |
download | serenity-c05c5a7ff43388994a85ce84121cdcfa6ee741ba.zip |
Kernel: Clarify ambiguous {File,Description}::absolute_path
Found due to smelly code in InodeFile::absolute_path.
In particular, this replaces the following misleading methods:
File::absolute_path
This method *never* returns an actual path, and if called on an
InodeFile (which is impossible), it would VERIFY_NOT_REACHED().
OpenFileDescription::try_serialize_absolute_path
OpenFileDescription::absolute_path
These methods do not guarantee to return an actual path (just like the
other method), and just like Custody::absolute_path they do not
guarantee accuracy. In particular, just renaming the method made a
TOCTOU bug obvious.
The new method signatures use KResultOr, just like
try_serialize_absolute_path() already did.
Diffstat (limited to 'Kernel/FileSystem/FIFO.cpp')
-rw-r--r-- | Kernel/FileSystem/FIFO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp index 002c220247..2d1e585043 100644 --- a/Kernel/FileSystem/FIFO.cpp +++ b/Kernel/FileSystem/FIFO.cpp @@ -132,9 +132,9 @@ KResultOr<size_t> FIFO::write(OpenFileDescription& fd, u64, const UserOrKernelBu return m_buffer->write(buffer, size); } -String FIFO::absolute_path(const OpenFileDescription&) const +KResultOr<NonnullOwnPtr<KString>> FIFO::pseudo_path(const OpenFileDescription&) const { - return String::formatted("fifo:{}", m_fifo_id); + return KString::try_create(String::formatted("fifo:{}", m_fifo_id)); } KResult FIFO::stat(::stat& st) const |