diff options
author | Oleg Nesterov <oleg@redhat.com> | 2012-09-16 19:07:41 +0200 |
---|---|---|
committer | Anton Arapov <anton@redhat.com> | 2012-10-29 11:50:14 +0100 |
commit | 8e171de1a5e8d37899dd9670efb6e6a60516c7a3 (patch) | |
tree | fc0a2e7659d8b906822f0de723d7dd1474eb0969 | |
parent | 9251477d8c2aaa36b0b835d9c15ece0fe8320657 (diff) | |
download | kernel-uprobes-8e171de1a5e8d37899dd9670efb6e6a60516c7a3.tar.gz kernel-uprobes-8e171de1a5e8d37899dd9670efb6e6a60516c7a3.tar.xz kernel-uprobes-8e171de1a5e8d37899dd9670efb6e6a60516c7a3.zip |
uprobes: Change valid_vma() to demand VM_MAYEXEC rather than VM_EXEC
uprobe_register() or uprobe_mmap() requires VM_READ | VM_EXEC, this
is not right. An apllication can do mprotect(PROT_EXEC) later and
execute this code.
Change valid_vma(is_register => true) to check VM_MAYEXEC instead.
No need to check VM_MAYREAD, it is always set.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
-rw-r--r-- | kernel/events/uprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 80e8c7b697b..a9de4081539 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -106,8 +106,8 @@ static bool valid_vma(struct vm_area_struct *vma, bool is_register) if (!is_register) return true; - if ((vma->vm_flags & (VM_HUGETLB|VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)) - == (VM_READ|VM_EXEC)) + if ((vma->vm_flags & (VM_HUGETLB | VM_WRITE | VM_MAYEXEC | VM_SHARED)) + == VM_MAYEXEC) return true; return false; |