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

Fixed a possible buffer overflow condition in vfs_get_module_path().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7342 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-04-28 11:20:19 +00:00
parent 1802569c68
commit a44e28cc02
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/core/fs/vfs.cpp
View File

@ -1386,7 +1386,7 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
size_t length; size_t length;
char *path; char *path;
if (strlcpy(pathBuffer, basePath, bufferSize) > bufferSize) if (bufferSize == 0 || strlcpy(pathBuffer, basePath, bufferSize - 1) > bufferSize - 1)
return B_BUFFER_OVERFLOW; return B_BUFFER_OVERFLOW;
status = path_to_vnode(pathBuffer, true, &dir, true); status = path_to_vnode(pathBuffer, true, &dir, true);
@ -1395,7 +1395,6 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
length = strlen(pathBuffer); length = strlen(pathBuffer);
if (pathBuffer[length - 1] != '/') { if (pathBuffer[length - 1] != '/') {
// ToDo: bufferSize race condition
pathBuffer[length] = '/'; pathBuffer[length] = '/';
length++; length++;
} }
@ -1412,7 +1411,7 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
else else
length = nextPath - moduleName; length = nextPath - moduleName;
if (length + 1>= bufferSize) { if (length + 1 >= bufferSize) {
status = B_BUFFER_OVERFLOW; status = B_BUFFER_OVERFLOW;
goto err; goto err;
} }