Changeset 333

Timestamp:

08/20/07 18:40:16 (9 months ago)

Author:

bart

Message:

Add code that checks the shared memory chunks if needed to make sure no data

was written past the boundary. Change #undef MM_CHECK in mm.c to
#define MM_CHECK

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (5 diffs)
• eaccelerator/trunk/mm.c (modified) (5 diffs)
• eaccelerator/trunk/mm.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ -20 +20 @@
-        * Rewrite the fixup_* functions so they no longer use the EAG(mem) global.
-        * Rewrite store_* functions so they no longer use the EAG(mem) global.
+        * Add code that checks the shared memory chunks if needed to make sure
+          no data was written past the boundary. Change #undef MM_CHECK in mm.c
+          to #define MM_CHECK
-
-2007-08-19  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/eaccelerator.c

@@ -749 +749 @@
-      p->removed  = 1;
-    }
+    mm_check_mem(p); 
-    return p;
-  }
@@ -800 +801 @@
-  int ret = 0;
-  int size = 0;
+  void *data = NULL;
-
-  zend_try {
@@ -815 +817 @@
-  EACCELERATOR_UNPROTECT();
-  EAG(mem) = eaccelerator_malloc(size);
+  data = EAG(mem);
-  if (EAG(mem) == NULL) {
-    EAG(mem) = eaccelerator_malloc2(size TSRMLS_CC);
@@ -825 +828 @@
-  if (EAG(mem)) {
-    memset(EAG(mem), 0, size);
-
+
+
-    p->mtime    = buf->st_mtime;
-    p->filesize = buf->st_size;
@@ -846 +850 @@
-      EACCELERATOR_PROTECT();
-      ret = 1;
+      mm_check_mem(data);
-    } else {
-      ret =  hash_add_file(p TSRMLS_CC);

eaccelerator/trunk/mm.c

@@ -67 +67 @@
-#endif
-
+#undef MM_CHECK 
+#define MM_PATTERN  0xdeadbeef
+
-#if defined(MM_SHM_MMAP_FILE) || defined(MM_SHM_MMAP_ZERO) || defined(MM_SHM_MMAP_ANON) || defined(MM_SHM_MMAP_POSIX) || defined(HAVE_MPROTECT)
-#  include <sys/mman.h>
@@ -1066 +1069 @@
-    mm_mem_head* x = NULL;
-    size_t realsize = (size_t)MM_ALIGN(MM_SIZE(size));
+#if MM_CHECK
+    realsize += (size_t)MM_ALIGN(sizeof(int));
+#endif
-    if (realsize <= mm->available) {
-      /* Search for free bucket */
@@ -1084 +1090 @@
-          break;
-        } else if (p->size > realsize && (best == NULL || best->size > p->size)) {
-grat
+bigg
-          best = p;
-          best_prev = q;
@@ -1119 +1125 @@
-    }
-    if (x != NULL) {
+#ifdef MM_CHECK
+      *(int *)((char *)x + realsize - (size_t)MM_ALIGN(sizeof(int))) = MM_PATTERN;
+#endif
-      return HEAD_TO_PTR(x);
-    }
@@ -1319 +1328 @@
-}
-
+#if defined(MM_CHECK) && !(defined(MM_TEST_SHM) || defined(MM_TEST_SEM))
+void mm_check_mem(void *x) {
+  mm_mem_head *p = PTR_TO_HEAD(x);
+  if (*((unsigned int *)((char *)p + p->size - (size_t)MM_ALIGN(sizeof(int)))) != MM_PATTERN) {
+    ea_debug_error("[EACCELERATOR] Corrupted memory detected\n");
+  }
+}
+#else
+void mm_check_mem(void *x) {}
+#endif
+
-#ifdef MM_TEST_SHM
-int main() {

eaccelerator/trunk/mm.h

@@ -67 +67 @@
-const char* mm_shm_type();
-const char* mm_sem_type();
+void mm_check_mem(void *x);
-
-#define MM_PROT_NONE  1