Changeset 770 for Whitix/branches/fs/fs/vfs/load.c

Timestamp:

07/09/08 18:46:57 (5 months ago)

Author:

mwhitworth

Message:

Fix buffer locking behaviour to avoid races.

Files:

• Whitix/branches/fs/fs/vfs/load.c (modified) (4 diffs)

Whitix/branches/fs/fs/vfs/load.c

@@ -72 +72 @@
         int err;
 
-        err=DoOpenFile(file,pathName,FILE_READ,0);
+        err=DoOpenFile(file, pathName, FILE_READ, 0);
 
         if (err)
                 return err;
-
+        
         if (file->vNode->mode & VFS_ATTR_DIR)
                 return -EISDIR;
@@ -377 +377 @@
         ExecSetupContext(&execArgs,pathName,fds,argv);
 
-        /* Open exectuable */
+        /* Open executable */
         err=ExecOpen(pathName,&execArgs.exec);
         if (err)
@@ -708 +708 @@
         /* Should calculate total program header size. TODO: Memory map in. See linker code. */
         buffer=(BYTE*)malloc(512);
-        if (!DoReadFile(&args->exec,buffer,512))
+        if (!DoReadFile(&args->exec, buffer, 512))
         {
                 KePrint("Failed to read file %s\n",args->pathName);
@@ -717 +717 @@
         header=(struct ElfHeader*)buffer;
 
-        if (ElfCheckHeader(header,ELF_EXEC | ELF_DYN))
-        {
-                KePrint("%s: not a valid ELF executable\n",args->pathName);
+        if (ElfCheckHeader(header, ELF_EXEC | ELF_DYN))
+        {
+                KePrint("%s: not a valid ELF executable\n", args->pathName);
                 err=-EINVAL;
                 goto freeBuffer;