github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 20:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCDrv: Allow opening by absolute path

Browse Source
This commit is contained in:
Stenzek 2025-03-24 18:58:48 +10:00
parent ae9023ddf3
commit ece18d10c5
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/pcdrv.cpp
View File

@ -79,17 +79,18 @@ static bool CloseFileHandle(u32 handle)
static std::string ResolveHostPath(const std::string& path) static std::string ResolveHostPath(const std::string& path)
{ {
// Double-check that it falls within the directory of the elf. // Double-check that it falls within the directory of the root.
// Not a real sandbox, but emulators shouldn't be treated as such. Don't run untrusted code! // Not a real sandbox, but emulators shouldn't be treated as such. Don't run untrusted code!
const std::string& root = g_settings.pcdrv_root; const std::string& root = g_settings.pcdrv_root;
std::string canonicalized_path = Path::Canonicalize(Path::Combine(root, path)); std::string canonicalized_path =
Path::IsAbsolute(path) ? Path::Canonicalize(path) : Path::Canonicalize(Path::Combine(root, path));
if (canonicalized_path.length() < root.length() || // Length has to be longer (a file), if (canonicalized_path.length() < root.length() || // Length has to be longer (a file),
!canonicalized_path.starts_with(root) || // and start with the host root, !canonicalized_path.starts_with(root) || // and start with the host root,
canonicalized_path[root.length()] != FS_OSPATH_SEPARATOR_CHARACTER) // and we can't access a sibling. canonicalized_path[root.length()] != FS_OSPATH_SEPARATOR_CHARACTER) // and we can't access a sibling.
{ {
ERROR_LOG("Denying access to path outside of PCDrv directory. Requested path: '{}', " ERROR_LOG("Denying access to path outside of PCDrv directory. Requested path: '{}', "
"Resolved path: '{}', Root directory: '{}'", "Resolved path: '{}', Root directory: '{}'",
path, root, canonicalized_path); path, canonicalized_path, root);
canonicalized_path.clear(); canonicalized_path.clear();
} }