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

FIFO: More correct locking when accessing file_cookie::open_mode

Browse Source
This commit is contained in:
Ingo Weinhold
2013-11-25 16:08:00 +01:00
parent ed9f4719f7
commit fd0bfd5593
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/fifo.cpp
+15 -9
View File
@@ -188,7 +188,7 @@ public:
void NotifyEndClosed(bool writer); void NotifyEndClosed(bool writer);
void Open(int openMode); void Open(int openMode);
void Close(int openMode, file_cookie* cookie); void Close(file_cookie* cookie);
int32 ReaderCount() const { return fReaderCount; } int32 ReaderCount() const { return fReaderCount; }
int32 WriterCount() const { return fWriterCount; } int32 WriterCount() const { return fWriterCount; }
@@ -239,7 +239,8 @@ private:
struct file_cookie { struct file_cookie {
int open_mode; int open_mode;
// guarded by Inode::fRequestLock
}; };
@@ -654,12 +655,14 @@ Inode::Open(int openMode)
void void
Inode::Close(int openMode, file_cookie* cookie) Inode::Close(file_cookie* cookie)
{ {
TRACE("Inode %p::Close(openMode = %d)\n", this, openMode); TRACE("Inode %p::Close(openMode = %d)\n", this, openMode);
MutexLocker locker(RequestLock()); MutexLocker locker(RequestLock());
int openMode = cookie->open_mode;
// Notify all currently reading file descriptors // Notify all currently reading file descriptors
ReadRequestList::Iterator iterator = fReadRequests.GetIterator(); ReadRequestList::Iterator iterator = fReadRequests.GetIterator();
while (ReadRequest* request = iterator.Next()) { while (ReadRequest* request = iterator.Next()) {
@@ -898,7 +901,7 @@ fifo_close(fs_volume* volume, fs_vnode* vnode, void* _cookie)
file_cookie* cookie = (file_cookie*)_cookie; file_cookie* cookie = (file_cookie*)_cookie;
FIFOInode* fifo = (FIFOInode*)vnode->private_node; FIFOInode* fifo = (FIFOInode*)vnode->private_node;
fifo->Close(cookie->open_mode, cookie); fifo->Close(cookie);
return B_OK; return B_OK;
} }
@@ -934,11 +937,11 @@ fifo_read(fs_volume* _volume, fs_vnode* _node, void* _cookie,
TRACE("fifo_read(vnode = %p, cookie = %p, length = %lu, mode = %d)\n", TRACE("fifo_read(vnode = %p, cookie = %p, length = %lu, mode = %d)\n",
inode, cookie, *_length, cookie->open_mode); inode, cookie, *_length, cookie->open_mode);
MutexLocker locker(inode->RequestLock());
if ((cookie->open_mode & O_RWMASK) != O_RDONLY) if ((cookie->open_mode & O_RWMASK) != O_RDONLY)
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
MutexLocker locker(inode->RequestLock());
if (inode->IsActive() && inode->WriterCount() == 0) { if (inode->IsActive() && inode->WriterCount() == 0) {
// as long there is no writer, and the pipe is empty, // as long there is no writer, and the pipe is empty,
// we always just return 0 to indicate end of file // we always just return 0 to indicate end of file
@@ -982,11 +985,11 @@ fifo_write(fs_volume* _volume, fs_vnode* _node, void* _cookie,
TRACE("fifo_write(vnode = %p, cookie = %p, length = %lu)\n", TRACE("fifo_write(vnode = %p, cookie = %p, length = %lu)\n",
_node, cookie, *_length); _node, cookie, *_length);
MutexLocker locker(inode->RequestLock());
if ((cookie->open_mode & O_RWMASK) != O_WRONLY) if ((cookie->open_mode & O_RWMASK) != O_WRONLY)
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
MutexLocker locker(inode->RequestLock());
size_t length = *_length; size_t length = *_length;
if (length == 0) if (length == 0)
return B_OK; return B_OK;
@@ -1067,12 +1070,15 @@ fifo_ioctl(fs_volume* _volume, fs_vnode* _vnode, void* _cookie, uint32 op,
static status_t static status_t
fifo_set_flags(fs_volume* _volume, fs_vnode* _vnode, void* _cookie, fifo_set_flags(fs_volume* _volume, fs_vnode* _node, void* _cookie,
int flags) int flags)
{ {
Inode* inode = (Inode*)_node->private_node;
file_cookie* cookie = (file_cookie*)_cookie; file_cookie* cookie = (file_cookie*)_cookie;
TRACE("fifo_set_flags(vnode = %p, flags = %x)\n", _vnode, flags); TRACE("fifo_set_flags(vnode = %p, flags = %x)\n", _vnode, flags);
MutexLocker locker(inode->RequestLock());
cookie->open_mode = (cookie->open_mode & ~(O_APPEND | O_NONBLOCK)) | flags; cookie->open_mode = (cookie->open_mode & ~(O_APPEND | O_NONBLOCK)) | flags;
return B_OK; return B_OK;
} }