diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-09 14:34:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-09 14:34:20 -0800 |
| commit | b2d3298e0916fa059712691c85a0e97becc4ab9f (patch) | |
| tree | c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e /mm/mprotect.c | |
| parent | 1a0bdadb4e36abac63b0a9787f372aac30c11a9e (diff) | |
| parent | a7f4255f906f60f72e00aad2fb000939449ff32e (diff) | |
| download | talos-op-linux-b2d3298e0916fa059712691c85a0e97becc4ab9f.tar.gz talos-op-linux-b2d3298e0916fa059712691c85a0e97becc4ab9f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index 5a688a2756be..f437d054c3bf 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -262,10 +262,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, down_write(¤t->mm->mmap_sem); - vma = find_vma_prev(current->mm, start, &prev); + vma = find_vma(current->mm, start); error = -ENOMEM; if (!vma) goto out; + prev = vma->vm_prev; if (unlikely(grows & PROT_GROWSDOWN)) { if (vma->vm_start >= end) goto out; |
