X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Fhandle.c;h=661ced8124adf7df94b85f09bd7600a6a81ad2fc;hb=b7d9f86f7a1c23be18b50d5c647fd5d3c08369c3;hp=db79933c9e6c82321b93a0f8cc50c53ed93d75e5;hpb=cb71a803fb168f500ad7c7dc36ad4bc9ba7c03a1;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/handle.c b/KernelLand/Kernel/vfs/handle.c
index db79933c..661ced81 100644
--- a/KernelLand/Kernel/vfs/handle.c
+++ b/KernelLand/Kernel/vfs/handle.c
@@ -76,15 +76,16 @@ int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode)
 		// Allocate Buffer
 		if( MM_GetPhysAddr( gaUserHandles ) == 0 )
 		{
-			Uint	addr, size;
-			size = max_handles * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
+			tPage	*pageptr = (void*)gaUserHandles;
+			size_t	size = max_handles * sizeof(tVFS_Handle);
+			for( size_t ofs = 0; ofs < size; ofs ++)
 			{
-				if( !MM_Allocate( (tVAddr)gaUserHandles + addr ) )
+				if( !MM_Allocate( pageptr ) )
 				{
 					Warning("OOM - VFS_AllocHandle");
 					Threads_Exit(0, 0xFF);	// Terminate user
 				}
+				pageptr ++;
 			}
 			memset( gaUserHandles, 0, size );
 		}
@@ -103,15 +104,15 @@ int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode)
 		// Allocate space if not already
 		if( MM_GetPhysAddr( gaKernelHandles ) == 0 )
 		{
-			Uint	addr, size;
-			size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
-			for(addr = 0; addr < size; addr += 0x1000)
+			tPage	*pageptr = (void*)gaKernelHandles;
+			size_t	size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
+			for(size_t ofs = 0; ofs < size; ofs += size)
 			{
-				if( !MM_Allocate( (tVAddr)gaKernelHandles + addr ) )
+				if( !MM_Allocate( pageptr ) )
 				{
 					Panic("OOM - VFS_AllocHandle");
-					Threads_Exit(0, 0xFF);	// Terminate application (get some space back)
 				}
+				pageptr ++;
 			}
 			memset( gaKernelHandles, 0, size );
 		}
@@ -151,14 +152,13 @@ void VFS_ReferenceUserHandles(void)
 
 void VFS_CloseAllUserHandles(void)
 {
-	 int	i;
 	 int	max_handles = *Threads_GetMaxFD();
 
 	// Check if this process has any handles
 	if( MM_GetPhysAddr( gaUserHandles ) == 0 )
 		return ;
 	
-	for( i = 0; i < max_handles; i ++ )
+	for( int i = 0; i < max_handles; i ++ )
 	{
 		tVFS_Handle	*h;
 		h = &gaUserHandles[i];
@@ -248,10 +248,13 @@ void VFS_RestoreHandles(int NumFDs, void *Handles)
 		
 		if( !MM_GetPhysAddr(h) )
 		{
-			if( !MM_Allocate( (tVAddr)h & ~(PAGE_SIZE-1) ) ) 
+			void	*pg = (void*)( (tVAddr)h & ~(PAGE_SIZE-1) );
+			if( !MM_Allocate( pg ) ) 
 			{
 				// OOM?
+				return ;
 			}
+			memset(pg, 0, PAGE_SIZE);
 		}
 		// Safe to dereference, as Threads_CloneTCB references handles
 		#if 1