sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-12 02:43:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

posix container: sys_write fails on validating pager's buffer as a user buffer.

Browse Source 
It might be a good idea to simply use mmap() from inside the pager and prefault it
as a conventional way of mapping internal buffers. Will be investigated.

- This would open the way that all internal buffer mapping is
  done in a standard way
- Standard syscalls would be possible to use from within the pager.
This commit is contained in:
Bahadir Balban
2009-10-05 21:56:55 +03:00
parent a6c7ac7766
commit 999cddd2c8
1 changed files with 12 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
conts/posix/mm0/mm/file.c
View File

@@ -399,14 +399,13 @@ struct vm_file *do_open2(struct tcb *task, int fd, unsigned long vnum, unsigned
* asks vfs if that file has been opened, and any other
* relevant information.
*/
int vfs_open(l4id_t opener, int fd, unsigned long *vnum, unsigned long *length)
int file_open(struct tcb *task, int fd)
{
struct tcb *task;
struct vnode *v;
struct vm_file *vmfile;
/* Check if such task exists */
if (!(task = find_task(opener)))
return -ESRCH;
if (fd < 0 || fd > TASK_FILES_MAX)
return -EINVAL;
/* Check if that fd has been opened */
if (!task->files->fd[fd].vnum)
@@ -417,32 +416,15 @@ int vfs_open(l4id_t opener, int fd, unsigned long *vnum, unsigned long *length)
task->files->fd[fd].vnum)))
return (int)v;
/* Read file information */
*vnum = v->vnum;
*length = v->size;
return 0;
}
/* Initialise a new file and the descriptor for it from given file data */
int do_open(struct tcb *task, int fd, unsigned long vnum, unsigned long length)
{
struct vm_file *vmfile;
/* fd slot must be empty */
BUG_ON(task->files->fd[fd].vnum != 0);
/* Cursor must be zero */
BUG_ON(task->files->fd[fd].cursor != 0);
/* Assign vnum to given fd on the task */
task->files->fd[fd].vnum = vnum;
task->files->fd[fd].cursor = 0;
/* Check if that vm_file is already in the list */
/* Check that vm_file is already in the list */
list_foreach_struct(vmfile, &global_vm_files.list, list) {
/* Check whether it is a vfs file and if so vnums match. */
if ((vmfile->type & VM_FILE_VFS) &&
vm_file_to_vnum(vmfile) == vnum) {
vm_file_to_vnum(vmfile) == v->vnum) {
/* Add a reference to it from the task */
task->files->fd[fd].vmfile = vmfile;
@@ -455,9 +437,11 @@ int do_open(struct tcb *task, int fd, unsigned long vnum, unsigned long length)
if (IS_ERR(vmfile = vfs_file_create()))
return (int)vmfile;
/* Initialise and add a reference to it from the task */
vm_file_to_vnum(vmfile) = vnum;
vmfile->length = length;
/* Assign file information */
vm_file_to_vnum(vmfile) = v->vnum;
vmfile->length = v->size;
/* Add a reference to it from the task */
vmfile->vm_obj.pager = &file_pager;
task->files->fd[fd].vmfile = vmfile;
vmfile->openers++;
@@ -468,26 +452,6 @@ int do_open(struct tcb *task, int fd, unsigned long vnum, unsigned long length)
return 0;
}
int file_open(struct tcb *opener, int fd)
{
int err;
unsigned long vnum;
unsigned long length;
if (fd < 0 || fd > TASK_FILES_MAX)
return -EINVAL;
/* Ask vfs if such a file has been recently opened */
if ((err = vfs_open(opener->tid, fd, &vnum, &length)) < 0)
return err;
/* Initialise local structures with received file data */
if ((err = do_open(opener, fd, vnum, length)) < 0)
return err;
return 0;
}
/*
* Inserts the page to vmfile's list in order of page frame offset.