i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* _user_flock() will no longer accept invalid operations, thus fixing bug #3141.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28889 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-01-12 12:07:06 +00:00
parent b3e849c2ce
commit f58d8cf235
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+19 -9
View File
@@ -8443,15 +8443,23 @@ _user_fsync(int fd)
status_t status_t
_user_flock(int fd, int op) _user_flock(int fd, int operation)
{ {
FUNCTION(("_user_fcntl(fd = %d, op = %d)\n", fd, operation));
// Check if the operation is valid
switch (operation & ~LOCK_NB) {
case LOCK_UN:
case LOCK_SH:
case LOCK_EX:
break;
default:
return B_BAD_VALUE;
}
struct file_descriptor *descriptor; struct file_descriptor *descriptor;
struct vnode *vnode; struct vnode *vnode;
struct flock flock;
status_t status;
FUNCTION(("_user_fcntl(fd = %d, op = %d)\n", fd, op));
descriptor = get_fd_and_vnode(fd, &vnode, false); descriptor = get_fd_and_vnode(fd, &vnode, false);
if (descriptor == NULL) if (descriptor == NULL)
return B_FILE_ERROR; return B_FILE_ERROR;
@@ -8461,17 +8469,19 @@ _user_flock(int fd, int op)
return B_BAD_VALUE; return B_BAD_VALUE;
} }
struct flock flock;
flock.l_start = 0; flock.l_start = 0;
flock.l_len = OFF_MAX; flock.l_len = OFF_MAX;
flock.l_whence = 0; flock.l_whence = 0;
flock.l_type = (op & LOCK_SH) != 0 ? F_RDLCK : F_WRLCK; flock.l_type = (operation & LOCK_SH) != 0 ? F_RDLCK : F_WRLCK;
if ((op & LOCK_UN) != 0) status_t status;
if ((operation & LOCK_UN) != 0)
status = release_advisory_lock(vnode, &flock); status = release_advisory_lock(vnode, &flock);
else { else {
status = acquire_advisory_lock(vnode, status = acquire_advisory_lock(vnode,
thread_get_current_thread()->team->session_id, &flock, thread_get_current_thread()->team->session_id, &flock,
(op & LOCK_NB) == 0); (operation & LOCK_NB) == 0);
} }
syscall_restart_handle_post(status); syscall_restart_handle_post(status);