Changeset 102

Timestamp:

Apr 26, 2007, 9:59:55 PM (18 years ago)

Author:

rainer

Message:

Flush before fork (fix for ticket #60), and fix for kcheck on 2.6.21 (ticket #63).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• include/sh_prelink.h (modified) (1 diff)
• src/sh_entropy.c (modified) (1 diff)
• src/sh_extern.c (modified) (2 diffs)
• src/sh_gpg.c (modified) (1 diff)
• src/sh_kern.c (modified) (3 diffs)
• src/sh_prelink.c (modified) (2 diffs)
• src/sh_processcheck.c (modified) (3 diffs)
• src/sh_tiger0.c (modified) (1 diff)
• src/sh_unix.c (modified) (2 diffs)

trunk/configure.ac

@@ -1851 +1851 @@
         if test "x${withval}" != "xno"; then 
                 AC_DEFINE(SH_USE_KERN)
+
+                kernel_numeric=`uname -r | sed 's%-%.%g' | sed 's%_%.%g' | awk -F. '{ print $1*65536+$2*256+$3 }'`
+                AC_DEFINE_UNQUOTED(SH_KERNEL_NUMBER, ${kernel_numeric}, [Kernel number])
+
                 kernelversion=`uname -r`
                 AC_DEFINE_UNQUOTED(SH_KERNEL_VERSION, _("${kernelversion}"), [Define the kernel version])

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.4:
-        * fixed compilation of kern_head (problem reported by S. Clormann)
+        * sh_kern.c: for 2.6.21+ don't check proc_root_lookup (not possible 
+          anymore? proc_root_inode.lookup != proc_root_lookup)
+        * sh_extern.c: flush streams before forking (problem if [Prelink]
+          used together with prelude logging, reported by M. deJong)
+        * fixed compilation of kern_head (regression cause by cross-compiling
+          fix; problem reported by S. Clormann)
         * more typos fixed (reported by John Horne)
 

trunk/include/sh_prelink.h

@@ -10 +10 @@
 /* return S_TRUE if ELF file, S_FALSE otherwise
  */
-int sh_prelink_iself (SL_TICKET fd, off_t size, int alert_timeout);
+int sh_prelink_iself (SL_TICKET fd, off_t size, int alert_timeout, char * path);
 
 /* configuration

trunk/src/sh_entropy.c

@@ -607 +607 @@
   }
   
+  fflush (NULL);
+
   source->pid = aud_fork(FIL__, __LINE__);
   

trunk/src/sh_extern.c

@@ -126 +126 @@
   int         pfd = -1;
 #endif
-  
+
   SL_ENTER(_("sh_ext_popen"));
 
@@ -218 +218 @@
 
   PDBG(3);
-  
+
   /* 
-   * -- Fork 
+   * -- Flush streams and fork 
    */
+  fflush (NULL);
+
   task->pid = aud_fork(FIL__, __LINE__);
 

trunk/src/sh_gpg.c

@@ -426 +426 @@
       SL_RETURN( (NULL), _("sh_gpg_popen"));
     }
+
+  fflush (NULL);
   
   source->pid = aud_fork(FIL__, __LINE__);

trunk/src/sh_kern.c

@@ -987 +987 @@
 static void check_proc_root (struct sh_kernel_info * kinfo)
 {
+  struct proc_dir_entry   proc_root_dir;
+
+/* 2.6.21 (((2) << 16) + ((6) << 8) + (21)) */
+#if SH_KERNEL_NUMBER < 132629
   struct inode_operations proc_root_inode;
-  struct proc_dir_entry   proc_root_dir;
 
   memcpy (&proc_root_inode, &(kinfo->proc_root_inode), sizeof(struct inode_operations));
-  memcpy (&proc_root_dir,   &(kinfo->proc_root_dir),   sizeof(struct proc_dir_entry));
-
+
+  /* Seems that the info does not relate anymore to proc_root_lookup(?)
+   */
   if ( (unsigned int) *proc_root_inode.lookup != proc_root_lookup)
     {
@@ -998 +1002 @@
                        _("proc_root_inode_operations.lookup != proc_root_lookup"));
     }
-  else if (    (((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops)
+#endif
+
+  memcpy (&proc_root_dir,   &(kinfo->proc_root_dir),   sizeof(struct proc_dir_entry));
+  if (    (((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops)
             && (proc_root_dir.size != proc_root_iops)
             && (((unsigned int) * &proc_root_dir.proc_fops) != proc_root_iops)
@@ -1006 +1013 @@
                        _("proc_root.proc_iops != proc_root_inode_operations"));
     }
+
   return;
 }

trunk/src/sh_prelink.c

@@ -71 +71 @@
 }
 
-int sh_prelink_iself (SL_TICKET fd, off_t size, int alert_timeout)
-{
-  long status;
-  char magic[4];
+int sh_prelink_iself (SL_TICKET fd, off_t size, int alert_timeout, char * path)
+{
+  long   status;
+  char   magic[4];
+  char * tmp;
 
   /* 42 bytes is about the minimum an ELF binary might have
@@ -95 +96 @@
       /*@+usedef@*/
     }
+  else
+    {
+      tmp = sh_util_safe_name (path);
+      sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, status, MSG_E_SUBGPATH, 
+                      _("Error reading file"), _("sh_prelink_iself"), tmp);
+      SH_FREE(path);
+    }
   return S_FALSE;
 }

trunk/src/sh_processcheck.c

@@ -786 +786 @@
 }
 
+extern int flag_err_debug;
+
 static int sh_processes_readps (FILE * in, short * res, 
                                 char * str, size_t len, 
@@ -844 +846 @@
             { 
               tstr[pos-1] = '\0';
+              if (flag_err_debug == SL_TRUE)
+                {
+                  sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, num, MSG_E_SUBGEN,
+                                  tstr,
+                                  _("sh_processes_readps"));
+                }
               /* fprintf(stderr, "<%ld> %s\n", num, tstr); */
               line = SKIP_WS; pos = 0;
@@ -1039 +1047 @@
       if ((res[j] & SH_PR_ANY) || (res[j] & SH_PR_PS_ANY))
         {
+          /* list all tests where the pid was found
+           */
           sh_processes_tlist (tests, sizeof(tests), res[j]);
+
           /* 
            * case 1: in ps and found 

trunk/src/sh_tiger0.c

@@ -361 +361 @@
     else
       tiger_fd = (-1);
-
 
     SL_RETURN( res, _("sh_tiger_hash_val"));

trunk/src/sh_unix.c

@@ -3211 +3211 @@
           else if ((theFile->check_mask & MODI_PREL) != 0 && 
                    S_TRUE == sh_prelink_iself(rval_open, fbuf.st_size, 
-                                              alert_timeout))
+                                              alert_timeout, theFile->fullpath))
             {
               if (0 != sh_prelink_run (theFile->fullpath, 
@@ -3251 +3251 @@
           else if (policy == SH_LEVEL_PRELINK &&
                    S_TRUE == sh_prelink_iself(rval_open, fbuf.st_size, 
-                                              alert_timeout))
+                                              alert_timeout, theFile->fullpath))
             {
               if (0 != sh_prelink_run (theFile->fullpath,