ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-20 17:11:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: improve VFS error handling

Browse Source
This commit is contained in:
Christian Helmuth 2017-06-09 16:02:57 +02:00
parent d5b85da8de
commit c9db94313c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/src/lib/libc/fd_alloc.cc
View File

@ -63,7 +63,7 @@ File_descriptor *File_descriptor_allocator::alloc(Plugin *plugin,
if (!alloc_ok) {
error("could not allocate libc_fd ", libc_fd,
libc_fd == ANY_FD ? " (any)" : "");
libc_fd <= ANY_FD ? " (any)" : "");
return 0;
}

19
repos/libports/src/lib/libc/vfs_plugin.cc
View File

@ -218,11 +218,18 @@ Libc::File_descriptor *Libc::Vfs_plugin::open(char const *path, int flags,
Libc::File_descriptor *fd =
Libc::file_descriptor_allocator()->alloc(this, vfs_context(handle), libc_fd);
/* FIXME error cleanup code leaks resources! */
if (!fd) {
errno = EMFILE;
return nullptr;
}
fd->flags = flags & (O_NONBLOCK|O_APPEND);
if ((flags & O_TRUNC) && (ftruncate(fd, 0) == -1)) {
/* XXX leaking fd, missing errno */
return 0;
errno = EINVAL; /* XXX which error code fits best ? */
return nullptr;
}
return fd;
@ -649,6 +656,8 @@ int Libc::Vfs_plugin::fcntl(Libc::File_descriptor *fd, int cmd, long arg)
*/
Libc::File_descriptor *new_fd =
Libc::file_descriptor_allocator()->alloc(this, 0);
if (!new_fd) return Errno(EMFILE);
new_fd->path(fd->fd_path);
/*
@ -657,8 +666,7 @@ int Libc::Vfs_plugin::fcntl(Libc::File_descriptor *fd, int cmd, long arg)
*/
if (dup2(fd, new_fd) == -1) {
Genode::error("Plugin::fcntl: dup2 unexpectedly failed");
errno = EINVAL;
return -1;
return Errno(EINVAL);
}
return new_fd->libc_fd;
@ -674,8 +682,7 @@ int Libc::Vfs_plugin::fcntl(Libc::File_descriptor *fd, int cmd, long arg)
}
Genode::error("fcntl(): command ", cmd, " not supported - vfs");
errno = EINVAL;
return -1;
return Errno(EINVAL);
}