Changeset 6 for trunk

Timestamp:

Dec 25, 2005, 9:26:06 PM (19 years ago)

Author:

rainer

Message:

Fix samhain_hide for kernel 2.6.14

File:

• trunk/src/samhain_hide.c (modified) (5 diffs)

trunk/src/samhain_hide.c

@@ -318 +318 @@
   int                  status = 0;    /* Return value from original getdents */
   struct inode       * dir_inode;
+  struct file        * fd_file;
   int                  dir_is_proc = 0;
 
@@ -337 +338 @@
   printk("STATUS %d\n", status);
 #endif
-
+  
   /*  0: end of directory.
    * -1: some error
@@ -346 +347 @@
       return (status);
     }
-
+  
   /* Handle directory caching. dir_inode is the inode of the directory.
    */
+#if defined(files_fdtable)
+  {
+    struct fdtable *fdt = files_fdtable(current->files);
+    fd_file = rcu_dereference(fdt->fd[fd]);
+  }
+#else
+  {
+    fd_file = current->files->fd[fd];
+  }
+#endif
+  
 #if defined(__LINUX_DCACHE_H)
-  dir_inode  = current->files->fd[fd]->f_dentry->d_inode;
+  dir_inode  = fd_file->f_dentry->d_inode;
 #else
-  dir_inode  = current->files->fd[fd]->f_inode;
+  dir_inode  = fd_file->f_inode;
 #endif
 
@@ -499 +511 @@
   long                 status = 0;    /* Return value from original getdents */
   struct inode       * dir_inode;
+  struct file        * fd_file;
   int                  dir_is_proc = 0;
 
@@ -530 +543 @@
   /* Handle directory caching. dir_inode is the inode of the directory.
    */
+#if defined(files_fdtable)
+  {
+    struct fdtable *fdt = files_fdtable(current->files);
+    fd_file = rcu_dereference(fdt->fd[fd]);
+  }
+#else
+  {
+    fd_file = current->files->fd[fd];
+  }
+#endif
+
 #if defined(__LINUX_DCACHE_H)
-  dir_inode  = current->files->fd[fd]->f_dentry->d_inode;
+  dir_inode  = fd_file->f_dentry->d_inode;
 #else
-  dir_inode  = current->files->fd[fd]->f_inode;
+  dir_inode  = fd_file->f_inode;
 #endif