Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_cache_write() can get a NULL buffer and still a size != 0, which the

Browse Source 
request handling wasn't taking into account.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37640 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-07-21 09:55:04 +00:00
parent 9bc87c767b
commit 83f46ed6ab
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/userlandfs/private/Requests.h
View File

@ -1838,6 +1838,7 @@ public:
void* cookie;
Address buffer;
size_t size;
off_t pos;
};

14
src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/KernelRequestHandler.cpp
View File

@ -706,9 +706,17 @@ KernelRequestHandler::_HandleRequest(FileCacheWriteRequest* request)
size_t size = 0;
if (result == B_OK) {
size = request->buffer.GetSize();
result = volume->WriteFileCache(request->vnid, request->cookie,
request->pos, request->buffer.GetData(), &size);
const void* data = request->buffer.GetData();
size = request->size;
if (data != NULL) {
if (size != (size_t)request->buffer.GetSize())
result = B_BAD_DATA;
}
if (result == B_OK) {
result = volume->WriteFileCache(request->vnid, request->cookie,
request->pos, data, &size);
}
}
// prepare the reply

10
src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp
View File

@ -824,11 +824,15 @@ UserlandFS::KernelEmu::file_cache_write(dev_t mountID, ino_t vnodeID,
request->nsid = mountID;
request->vnid = vnodeID;
request->cookie = cookie;
request->size = *_size;
request->pos = offset;
error = allocator.AllocateData(request->buffer, buffer, *_size, 1, false);
if (error != B_OK)
return error;
if (buffer != NULL) {
error = allocator.AllocateData(request->buffer, buffer, *_size, 1,
false);
if (error != B_OK)
return error;
}
// send the request
UserlandRequestHandler handler(fileSystem, FILE_CACHE_WRITE_REPLY);