[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit c506c2c5554aa55f2f68767272fda7a2195dfce4
Author: Török Edvin <edwin at clamav.net>
Date:   Sun Mar 28 13:52:29 2010 +0300

    Fallback to interpreter mode when SELinux denies 'execmem' access. (bb #1901).
    
    This also fixes a crash when run under SELinux: MemoryBlock() needs to
    initialize its field to 0!

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index 680fd11..aa8aaaa 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -58,6 +58,7 @@
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/System/DataTypes.h"
 #include "llvm/System/Host.h"
+#include "llvm/System/Memory.h"
 #include "llvm/System/Mutex.h"
 #include "llvm/System/Signals.h"
 #include "llvm/System/Threading.h"
@@ -1803,6 +1804,7 @@ int bytecode_init(void)
 int cli_bytecode_init_jit(struct cli_all_bc *bcs, unsigned dconfmask)
 {
     LLVMApiScopedLock scopedLock;
+    bcs->engine = NULL;
     Triple triple(sys::getHostTriple());
     if (cli_debug_flag)
 	errs() << "host triple is: " << sys::getHostTriple() << "\n";
@@ -1846,6 +1848,19 @@ int cli_bytecode_init_jit(struct cli_all_bc *bcs, unsigned dconfmask)
 	/* i386 and i486 has to fallback to interpreter */
 	return 0;
     }
+    std::string ErrMsg;
+    sys::MemoryBlock B = sys::Memory::AllocateRWX(4096, NULL, &ErrMsg);
+    if (B.base() == 0) {
+	errs() << MODULE << ErrMsg << "\n";
+#ifdef __linux__
+	errs() << MODULE << "SELinux is preventing 'execmem' access\n";
+#endif
+	errs() << MODULE << "falling back to interpreter mode\n";
+	return 0;
+    } else {
+	sys::Memory::ReleaseRWX(B);
+    }
+
     bcs->engine = new(std::nothrow) cli_bcengine;
     if (!bcs->engine)
 	return CL_EMEM;
diff --git a/libclamav/c++/llvm/include/llvm/System/Memory.h b/libclamav/c++/llvm/include/llvm/System/Memory.h
index 69251dd..01bcab1 100644
--- a/libclamav/c++/llvm/include/llvm/System/Memory.h
+++ b/libclamav/c++/llvm/include/llvm/System/Memory.h
@@ -27,7 +27,7 @@ namespace sys {
   /// @brief Memory block abstraction.
   class MemoryBlock {
   public:
-    MemoryBlock() { }
+    MemoryBlock() : Address(0), Size(0) { }
     MemoryBlock(void *addr, size_t size) : Address(addr), Size(size) { }
     void *base() const { return Address; }
     size_t size() const { return Size; }

-- 
Debian repository for ClamAV