ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-23 23:42:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VFS: check path on the symlink node readlink

Browse Source 
Fixes #1790
This commit is contained in:
Emery Hemingway 2015-11-24 15:12:47 +01:00 committed by Christian Helmuth
parent 44cfc414ee
commit ee25dcbae3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/include/vfs/symlink_file_system.h
View File

@ -66,6 +66,8 @@ class Vfs::Symlink_file_system : public File_system
file_size buf_size, file_size buf_size,
file_size &out_len) override file_size &out_len) override
{ {
if (!_is_single_file(path))
return READLINK_ERR_NO_ENTRY;
out_len = min(buf_size, file_size(sizeof(_target))); out_len = min(buf_size, file_size(sizeof(_target)));
strncpy(buf, _target, out_len); strncpy(buf, _target, out_len);
return READLINK_OK; return READLINK_OK;
@ -104,7 +106,7 @@ class Vfs::Symlink_file_system : public File_system
char const *leaf_path(char const *path) override char const *leaf_path(char const *path) override
{ {
return path; return _is_single_file(path) ? path : 0;
} }
Dirent_result dirent(char const *path, file_offset index, Dirent &out) override Dirent_result dirent(char const *path, file_offset index, Dirent &out) override
@ -112,11 +114,13 @@ class Vfs::Symlink_file_system : public File_system
if (!_is_root(path)) if (!_is_root(path))
return DIRENT_ERR_INVALID_PATH; return DIRENT_ERR_INVALID_PATH;
out.fileno = 1;
if (index == 0) { if (index == 0) {
out.type = DIRENT_TYPE_SYMLINK; out.type = DIRENT_TYPE_SYMLINK;
strncpy(out.name, _filename, sizeof(out.name)); strncpy(out.name, _filename, sizeof(out.name));
} else { } else {
out.type = DIRENT_TYPE_END; out.type = DIRENT_TYPE_END;
out.name[0] = '\0';
} }
return DIRENT_OK; return DIRENT_OK;