commit de58105fad20e26c2997eec30a8dfebeacf28e32
author Jean-Baptiste Queru <jbq@google.com> Sat Oct 16 09:13:27 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 16 09:13:27 2010 -0700
tree 2850eabc49944cd8986a4e54a1370794aea05ea9
parent dc8827ee2388687a6f08a0c2da8505cdace737a6
parent 287a9585dc85bff9b81e962f6be4f2b36512d345

am 287a9585: am 8e0e372a: Set PROT_EXEC on the whole pixelflinger code cache.

Merge commit '287a9585dc85bff9b81e962f6be4f2b36512d345'

* commit '287a9585dc85bff9b81e962f6be4f2b36512d345':
  Set PROT_EXEC on the whole pixelflinger code cache.

libpixelflinger/codeflinger/CodeCache.cpp

diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index 5877ff4..125c3ce 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -94,7 +94,7 @@
     long pagemask = ~(pagesize - 1);  // assumes pagesize is a power of 2
 
     uint32_t* pageStart = (uint32_t*) (((uintptr_t) mBase) & pagemask);
-    size_t adjustedLength = mBase - pageStart + mSize;
+    size_t adjustedLength = (mBase - pageStart) * sizeof(uint32_t) + mSize;
 
     if (mBase && mprotect(pageStart, adjustedLength, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) {
         mspace_free(getMspace(), mBase);