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

Added a simple magic field mechanism to make chkbfs calls a little more safe.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3381 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-05-29 01:02:18 +00:00
parent 87142a1ecf
commit c3f10b4674
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
View File

@ -642,10 +642,23 @@ BlockAllocator::Free(Transaction *transaction, block_run run)
// the "chkbfs" command
bool
BlockAllocator::IsValidCheckControl(check_control *control)
{
if (control == NULL
|| control->magic != BFS_IOCTL_CHECK_MAGIC) {
FATAL(("invalid check_control (%p)!\n", control));
return false;
}
return true;
}
status_t
BlockAllocator::StartChecking(check_control *control)
{
if (control == NULL)
if (!IsValidCheckControl(control))
return B_BAD_VALUE;
status_t status = fLock.Lock();
@ -771,7 +784,7 @@ BlockAllocator::StopChecking(check_control *control)
status_t
BlockAllocator::CheckNextNode(check_control *control)
{
if (control == NULL)
if (!IsValidCheckControl(control))
return B_BAD_VALUE;
check_cookie *cookie = (check_cookie *)control->cookie;

1
src/add-ons/kernel/file_systems/bfs/BlockAllocator.h
View File

@ -44,6 +44,7 @@ class BlockAllocator {
status_t CheckInode(Inode *inode, check_control *control = NULL);
private:
bool IsValidCheckControl(check_control *control);
bool CheckBitmapIsUsedAt(off_t block) const;
void SetCheckBitmapAt(off_t block);

4
src/add-ons/kernel/file_systems/bfs/bfs_control.h
View File

@ -34,6 +34,7 @@ extern "C" {
* BFS_IOCTL_START_CHECKING is called
*/
struct check_control {
uint32 magic;
uint32 flags;
char name[B_FILE_NAME_LENGTH];
vnode_id inode;
@ -69,4 +70,7 @@ struct check_control {
#define BFS_WRONG_TYPE 16
#define BFS_NAMES_DONT_MATCH 32
/* check control magic value */
#define BFS_IOCTL_CHECK_MAGIC 'BChk'
#endif /* BFS_CONTROL_H */