diff --git a/[refs] b/[refs] index 645776d6c59a..60c6af9fb000 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75ed82ea53bd0d2d8083261123576250f7ba851e +refs/heads/master: 78a320542e6cdb2800cd736b2d136e4261d34f43 diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index 80e8c7b697b9..a9de40815391 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/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;