Don't modify memory access right when changing data in debug stub.

src/trusted/debug_stub/target.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ skipping 79 matching lines @@
   if (itr != breakMap_.end()) return false;
 
   uint8_t *data = new uint8_t[bp->size_];
   if (NULL == data) return false;
 
   // Copy the old code from here
   if (IPlatform::GetMemory(address, bp->size_, data) == false) {
     delete[] data;
     return false;
   }
-  if (IPlatform::SetMemory(address, bp->size_, bp->code_) == false) {
+  if (IPlatform::SetMemory(nap_, address, bp->size_, bp->code_) == false) {
     delete[] data;
     return false;
   }
 
   breakMap_[address] = data;
   return true;
 }
 
 bool Target::RemoveTemporaryBreakpoints(IThread *thread) {
   const Abi::BPDef *bp_def = abi_->GetBreakpointDef();
   uintptr_t prog_ctr = thread->GetContext()->prog_ctr;
 
   // If this ABI does not support breakpoints then fail.
   if (!bp_def) {
     return false;
   }
 
   // Iterate through the map, removing breakpoints
   while (!breakMap_.empty()) {
     // Copy the key/value locally
     BreakMap_t::iterator cur = breakMap_.begin();
     uint64_t addr = cur->first;
     uint8_t *data = cur->second;
 
     // Then remove it from the map
     breakMap_.erase(cur);
 
     // Copy back the old code, and free the data
-    if (!IPlatform::SetMemory(addr, bp_def->size_, data))
+    if (!IPlatform::SetMemory(nap_, addr, bp_def->size_, data))
       NaClLog(LOG_ERROR, "Failed to undo breakpoint.\n");
     delete[] data;
 
     uintptr_t sys_prog_ctr;
     if (NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86 && NACL_BUILD_SUBARCH == 32) {
       sys_prog_ctr = NaClUserToSysAddr(nap_, prog_ctr);
     } else {
       sys_prog_ctr = prog_ctr;
     }
     // If we hit the breakpoint, ensure that it is reported as SIGTRAP
@@ skipping 343 matching lines @@
         uint64_t sys_addr = UserToSysAddr(user_addr);
         if (sys_addr == kNaClBadAddress) {
           err = FAILED;
           break;
         }
 
         len = static_cast<uint32_t>(wlen);
         uint8_t *block = new uint8_t[len];
         pktIn->GetBlock(block, len);
 
-        if (!port::IPlatform::SetMemory(sys_addr, len, block)) {
+        if (!port::IPlatform::SetMemory(nap_, sys_addr, len, block)) {
           err = FAILED;
           break;
         }
 
         pktOut->AddString("OK");
         break;
       }
 
     case 'q': {
       string tmp;
@@ skipping 254 matching lines @@
 IThread* Target::GetThread(uint32_t id) {
   ThreadMap_t::const_iterator itr;
   itr = threads_.find(id);
   if (itr != threads_.end()) return itr->second;
 
   return NULL;
 }
 
 
 }  // namespace gdb_rsp