[Patch] Updated version of emutramp_enabled_check() for PaX kernels

[Magnus Granberg <zorry@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

Hi
This patch check the PaX status in /proc/self/status
and it will return true or fales depend on the status of
emulate trampolines in Pax.

/Magnus

2013-04-29  Magnus Granberg <zorry@gentoo.org>

	* src/cloures.c (emutramp_enabled_check): Check /proc/self/status for PaX 	
	status.


[-- Attachment #2: libffi-3.0.13-emutramp_pax_log.patch --]
[-- Type: text/x-patch, Size: 791 bytes --]

--- a/src/closures.c	2013-03-17 23:27:11.000000000 +0100
+++ b/src/closures.c	2013-04-29 23:26:02.279022022 +0200
@@ -181,10 +181,26 @@ static int emutramp_enabled = -1;
 static int
 emutramp_enabled_check (void)
 {
-  if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL)
-    return 1;
-  else
+  char *buf = NULL;
+  size_t len = 0;
+  FILE *f;
+  int ret;
+  f = fopen ("/proc/self/status", "r");
+  if (f == NULL)
     return 0;
+  ret = 0;
+
+  while (getline (&buf, &len, f) != -1)
+    if (!strncmp (buf, "PaX:", 4))
+      {
+        char emutramp;
+        if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
+          ret = (emutramp == 'E');
+        break;
+      }
+  free (buf);
+  fclose (f);
+  return ret;
 }
 
 #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \