nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fs: add just in case bounds checking to linux/macos dirent read

Browse source
This commit is contained in:
Michael Scire 2022-03-06 19:13:05 -08:00 committed by SciresM
parent 1933f35db6
commit 6368d8063a
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/libstratosphere/source/fssystem/fssystem_local_file_system.cpp
View file

@ -746,6 +746,8 @@ namespace ams::fssystem {
std::memset(out_entry->name, 0, sizeof(out_entry->name)); std::memset(out_entry->name, 0, sizeof(out_entry->name));
const auto name_len = std::strlen(ent->d_name); const auto name_len = std::strlen(ent->d_name);
AMS_ABORT_UNLESS(name_len <= fs::EntryNameLengthMax);
std::memcpy(out_entry->name, ent->d_name, name_len + 1); std::memcpy(out_entry->name, ent->d_name, name_len + 1);
out_entry->type = (ent->d_type == DT_DIR) ? fs::DirectoryEntryType_Directory : fs::DirectoryEntryType_File; out_entry->type = (ent->d_type == DT_DIR) ? fs::DirectoryEntryType_Directory : fs::DirectoryEntryType_File;
@ -753,6 +755,7 @@ namespace ams::fssystem {
/* If we have to, get the filesize. This is (unfortunately) expensive on linux. */ /* If we have to, get the filesize. This is (unfortunately) expensive on linux. */
if (out_entry->type == fs::DirectoryEntryType_File && !m_not_require_file_size) { if (out_entry->type == fs::DirectoryEntryType_File && !m_not_require_file_size) {
/* Set up the temporary file path. */ /* Set up the temporary file path. */
AMS_ABORT_UNLESS(base_path_len + name_len + 1 <= PATH_MAX);
std::memcpy(path_buf + base_path_len, ent->d_name, name_len + 1); std::memcpy(path_buf + base_path_len, ent->d_name, name_len + 1);
/* Get the file stats. */ /* Get the file stats. */