diff --git a/[refs] b/[refs] index 7d858878a9a7..be2a1ed82607 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b4d5b8b39fd3701ed3693a89f2bd8f6ef49bce2 +refs/heads/master: d00c7b993712e4bb16d0012b35b654e40159b327 diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c index 2e140a6ae22e..829fc904de11 100644 --- a/trunk/mm/nommu.c +++ b/trunk/mm/nommu.c @@ -1258,9 +1258,9 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in len = vma->vm_end - addr; /* only read or write mappings where it is permitted */ - if (write && vma->vm_flags & VM_WRITE) + if (write && vma->vm_flags & VM_MAYWRITE) len -= copy_to_user((void *) addr, buf, len); - else if (!write && vma->vm_flags & VM_READ) + else if (!write && vma->vm_flags & VM_MAYREAD) len -= copy_from_user(buf, (void *) addr, len); else len = 0;