mesa: added _mesa_[Get]TexParameterI[u]iv() functions

[mesa.git] / src / mesa / main / execmem.c

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 7d498a82791f66ecbb5d96184538ad4073669296..4c6139985fe5b4977dcbc240761856549a57eebc 100644 (file)
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -24,7 +24,7 @@
 
 
 /**
- * \file exemem.c
+ * \file execmem.c
  * Functions for allocating executable memory.
  *
  * \author Keith Whitwell
@@ -32,11 +32,11 @@
 
 
 #include "imports.h"
-#include "glthread.h"
+#include "glapi/glthread.h"
 
 
 
-#if defined(__linux__) && !defined(XFree86Server)
+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
@@ -47,7 +47,17 @@
 #include <sys/mman.h>
 #include "mm.h"
 
-#define EXEC_HEAP_SIZE (128*1024)
+#ifdef MESA_SELINUX
+#include <selinux/selinux.h>
+#endif
+
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+
+#define EXEC_HEAP_SIZE (10*1024*1024)
 
 _glthread_DECLARE_STATIC_MUTEX(exec_mutex);
 
@@ -55,16 +65,25 @@ static struct mem_block *exec_heap = NULL;
 static unsigned char *exec_mem = NULL;
 
 
-static void
+static int
 init_heap(void)
 {
+#ifdef MESA_SELINUX
+   if (is_selinux_enabled()) {
+      if (!security_get_boolean_active("allow_execmem") ||
+         !security_get_boolean_pending("allow_execmem"))
+         return 0;
+   }
+#endif
+
    if (!exec_heap)
       exec_heap = mmInit( 0, EXEC_HEAP_SIZE );
    
    if (!exec_mem)
-      exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE, 
-                                       PROT_EXEC | PROT_READ | PROT_WRITE, 
-                                       MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+      exec_mem = mmap(NULL, EXEC_HEAP_SIZE, PROT_EXEC | PROT_READ | PROT_WRITE,
+                     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+   return (exec_mem != MAP_FAILED);
 }
 
 
@@ -76,7 +95,8 @@ _mesa_exec_malloc(GLuint size)
 
    _glthread_LOCK_MUTEX(exec_mutex);
 
-   init_heap();
+   if (!init_heap())
+      goto bail;
 
    if (exec_heap) {
       size = (size + 31) & ~31;
@@ -85,7 +105,10 @@ _mesa_exec_malloc(GLuint size)
 
    if (block)
       addr = exec_mem + block->ofs;
+   else 
+      _mesa_printf("_mesa_exec_malloc failed\n");
 
+bail:
    _glthread_UNLOCK_MUTEX(exec_mutex);
    
    return addr;