Signed-off-by: Yu-cheng Yu <yu-cheng.yu@xxxxxxxxx> --- mm/mmap.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mm/mmap.c b/mm/mmap.c index fc41c0543d7f..e7d1fcb7ec58 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2810,6 +2810,16 @@ EXPORT_SYMBOL(vm_munmap); SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) { + struct vm_area_struct *vma; + + /* Do not munmap shadow stack */ + down_read(¤t->mm->mmap_sem); + vma = find_vma(current->mm, addr); + if (vma && (vma->vm_flags & VM_SHSTK)) { + up_read(¤t->mm->mmap_sem); + return -EINVAL; + } + up_read(¤t->mm->mmap_sem); profile_munmap(addr); return vm_munmap(addr, len); } @@ -2851,6 +2861,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (!vma || !(vma->vm_flags & VM_SHARED)) goto out; + if (vma->vm_flags & VM_SHSTK) + goto out; + if (start < vma->vm_start) goto out; -- 2.15.1