ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VFS Rump: catch exceptions, print unhandled errors

Browse Source 
Ref #2642
This commit is contained in:
Ehmry - 2018-01-11 20:42:58 -06:00 committed by Norman Feske
parent c7d0accac0
commit 980a2da677
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
repos/dde_rump/src/lib/vfs/rump/vfs_rump.cc
View File

@ -7,7 +7,7 @@
*/ */
/* /*
* Copyright (C) 2014-2017 Genode Labs GmbH * Copyright (C) 2014-2018 Genode Labs GmbH
* *
* This file is part of the Genode OS framework, which is distributed * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3. * under the terms of the GNU Affero General Public License version 3.
@ -102,6 +102,7 @@ class Vfs::Rump_file_system : public File_system
case EINTR: return FTRUNCATE_ERR_INTERRUPT; case EINTR: return FTRUNCATE_ERR_INTERRUPT;
case ENOSPC: return FTRUNCATE_ERR_NO_SPACE; case ENOSPC: return FTRUNCATE_ERR_NO_SPACE;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return FTRUNCATE_ERR_NO_PERM; return FTRUNCATE_ERR_NO_PERM;
} }
return FTRUNCATE_OK; return FTRUNCATE_OK;
@ -117,6 +118,7 @@ class Vfs::Rump_file_system : public File_system
case EIO: return READ_ERR_IO; case EIO: return READ_ERR_IO;
case EINTR: return READ_ERR_INTERRUPT; case EINTR: return READ_ERR_INTERRUPT;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return READ_ERR_IO; return READ_ERR_IO;
} }
out_count = n; out_count = n;
@ -136,6 +138,7 @@ class Vfs::Rump_file_system : public File_system
case EIO: return WRITE_ERR_IO; case EIO: return WRITE_ERR_IO;
case EINTR: return WRITE_ERR_INTERRUPT; case EINTR: return WRITE_ERR_INTERRUPT;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return WRITE_ERR_IO; return WRITE_ERR_IO;
} }
out_count = n; out_count = n;
@ -458,11 +461,22 @@ class Vfs::Rump_file_system : public File_system
case EEXIST: return OPEN_ERR_EXISTS; case EEXIST: return OPEN_ERR_EXISTS;
case ENOSPC: return OPEN_ERR_NO_SPACE; case ENOSPC: return OPEN_ERR_NO_SPACE;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return OPEN_ERR_NO_PERM; return OPEN_ERR_NO_PERM;
} }
*handle = new (alloc) Rump_vfs_file_handle(*this, alloc, mode, fd); try {
return OPEN_OK; Rump_vfs_file_handle *h = new (alloc)
Rump_vfs_file_handle(*this, alloc, mode, fd);
*handle = h;
return OPEN_OK;
} catch (Genode::Out_of_ram) {
rump_sys_close(fd);
return OPEN_ERR_OUT_OF_RAM;
} catch (Genode::Out_of_caps) {
rump_sys_close(fd);
return OPEN_ERR_OUT_OF_CAPS;
}
} }
Opendir_result opendir(char const *path, bool create, Opendir_result opendir(char const *path, bool create,
@ -479,6 +493,7 @@ class Vfs::Rump_file_system : public File_system
case EEXIST: return OPENDIR_ERR_NODE_ALREADY_EXISTS; case EEXIST: return OPENDIR_ERR_NODE_ALREADY_EXISTS;
case ENOSPC: return OPENDIR_ERR_NO_SPACE; case ENOSPC: return OPENDIR_ERR_NO_SPACE;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return OPENDIR_ERR_PERMISSION_DENIED; return OPENDIR_ERR_PERMISSION_DENIED;
} }
} }
@ -491,12 +506,22 @@ class Vfs::Rump_file_system : public File_system
case EEXIST: return OPENDIR_ERR_NODE_ALREADY_EXISTS; case EEXIST: return OPENDIR_ERR_NODE_ALREADY_EXISTS;
case ENOSPC: return OPENDIR_ERR_NO_SPACE; case ENOSPC: return OPENDIR_ERR_NO_SPACE;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return OPENDIR_ERR_PERMISSION_DENIED; return OPENDIR_ERR_PERMISSION_DENIED;
} }
*handle = new (alloc) Rump_vfs_dir_handle(*this, alloc, 0777, fd, path); try {
return OPENDIR_OK; Rump_vfs_dir_handle *h = new (alloc)
Rump_vfs_dir_handle(*this, alloc, 0777, fd, path);
*handle = h;
return OPENDIR_OK;
} catch (Genode::Out_of_ram) {
rump_sys_close(fd);
return OPENDIR_ERR_OUT_OF_RAM;
} catch (Genode::Out_of_caps) {
rump_sys_close(fd);
return OPENDIR_ERR_OUT_OF_CAPS;
}
} }
Openlink_result openlink(char const *path, bool create, Openlink_result openlink(char const *path, bool create,
@ -510,6 +535,7 @@ class Vfs::Rump_file_system : public File_system
case EACCES: return OPENLINK_ERR_PERMISSION_DENIED; case EACCES: return OPENLINK_ERR_PERMISSION_DENIED;
case ENAMETOOLONG: return OPENLINK_ERR_NAME_TOO_LONG; case ENAMETOOLONG: return OPENLINK_ERR_NAME_TOO_LONG;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return OPENLINK_ERR_PERMISSION_DENIED; return OPENLINK_ERR_PERMISSION_DENIED;
} }
} }
@ -518,11 +544,16 @@ class Vfs::Rump_file_system : public File_system
if (rump_sys_readlink(path, &dummy, sizeof(dummy)) == -1) switch(errno) { if (rump_sys_readlink(path, &dummy, sizeof(dummy)) == -1) switch(errno) {
case ENOENT: return OPENLINK_ERR_LOOKUP_FAILED; case ENOENT: return OPENLINK_ERR_LOOKUP_FAILED;
default: default:
Genode::error(__func__, ": unhandled rump error ", errno);
return OPENLINK_ERR_PERMISSION_DENIED; return OPENLINK_ERR_PERMISSION_DENIED;
} }
*handle = new (alloc) Rump_vfs_symlink_handle(*this, alloc, 0777, path); try {
return OPENLINK_OK; *handle = new (alloc) Rump_vfs_symlink_handle(*this, alloc, 0777, path);
return OPENLINK_OK;
}
catch (Genode::Out_of_ram) { return OPENLINK_ERR_OUT_OF_RAM; }
catch (Genode::Out_of_caps) { return OPENLINK_ERR_OUT_OF_CAPS; }
} }
void close(Vfs_handle *vfs_handle) override void close(Vfs_handle *vfs_handle) override
@ -563,6 +594,9 @@ class Vfs::Rump_file_system : public File_system
switch (errno) { switch (errno) {
case ENOENT: return UNLINK_ERR_NO_ENTRY; case ENOENT: return UNLINK_ERR_NO_ENTRY;
case ENOTEMPTY: return UNLINK_ERR_NOT_EMPTY; case ENOTEMPTY: return UNLINK_ERR_NOT_EMPTY;
default:
Genode::error(__func__, ": unhandled rump error ", errno);
return UNLINK_ERR_NO_PERM;
} }
return UNLINK_ERR_NO_PERM; return UNLINK_ERR_NO_PERM;
} }