Changeset 443

Timestamp:

Oct 27, 2013, 9:13:08 PM (11 years ago)

Author:

katerina

Message:

Fix for ticket #347 (the --enable-khide option does not work on Linux 3.x)

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/samhain_erase.c (modified) (1 diff)
• src/samhain_hide.c (modified) (3 diffs)

trunk/configure.ac

@@ -2064 +2064 @@
         [
         if test "x${enable_khide}" != xno; then
+
+           kernel_testsupport=`uname -r | sed s,^3.*,LINUX3,`
+           if test "x${kernel_testsupport}" = "xLINUX3"; then
+              AC_MSG_ERROR([The --enable-khide option is not supported on Linux kernel version 3.x or above.])
+           fi
+
            if test "x${enableval}" != "xyes"; then
                 khidemap="${enableval}"

trunk/docs/Changelog

@@ +1 @@
+        * Drop support for --enable-khide on kernel version 3.x and above
         * Fix IgnoreAdded to anchor regex at beginning of path (reported by
           R.Lindner)

trunk/src/samhain_erase.c

@@ -71 +71 @@
 /* The configure options (#defines) for the Kernel
  */
+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
+#if SH_KERNEL_NUMERIC >= KERNEL_VERSION(2,6,33)
+#include <generated/autoconf.h>
+#else
+#if SH_KERNEL_NUMERIC >= KERNEL_VERSION(2,6,19)
+#include <linux/autoconf.h>
+#else
 #include <linux/config.h>
-
 #ifdef CONFIG_MODVERSIONS
 #include <linux/modversions.h>
+#endif
+#endif
 #endif
 

trunk/src/samhain_hide.c

@@ -101 +101 @@
 
 #ifndef LINUX26
+#ifndef __KERNEL__
 #define __KERNEL__
+#endif
+#ifndef MODULE
 #define MODULE
+#endif
 #endif
 #define LINUX
@@ -137 +141 @@
 #endif
 
-#ifndef LINUX26
+#if SH_KERNEL_NUMERIC < KERNEL_VERSION(2,6,0)
 #ifdef CONFIG_MODVERSIONS
 #include <linux/modversions.h>
 #endif
-#endif
-
+#else
+#ifndef LINUX26
+#define LINUX26
+#endif
+#endif
 
 #ifdef LINUX26
@@ -179 +186 @@
 /* Include for lock_kernel().
  */
+#if SH_KERNEL_NUMERIC < KERNEL_VERSION(3,0,0)
 #include <linux/smp_lock.h>
+#else
+static inline void lock_kernel(void) { }
+static inline void unlock_kernel(void) { }
+#endif
 
 #if SH_KERNEL_NUMERIC >= SH_KERNEL_MIN