Replace use of the legacy vm_flags_t flags with vma_flags_t values in the
uprobes VMA validity checks.
No functional change intended.
Signed-off-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
---
kernel/events/uprobes.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index caf444762a27..853fc952331c 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -134,12 +134,14 @@ static void uprobe_warn(struct task_struct *t, const char *msg)
*/
static bool valid_vma(struct vm_area_struct *vma, bool is_register)
{
- vm_flags_t flags = VM_HUGETLB | VM_MAYEXEC | VM_MAYSHARE;
+ vma_flags_t forbidden = mk_vma_flags(VMA_HUGETLB_BIT,
+ VMA_MAYSHARE_BIT);
if (is_register)
- flags |= VM_WRITE;
+ vma_flags_set(&forbidden, VMA_WRITE_BIT);
- return vma->vm_file && (vma->vm_flags & flags) == VM_MAYEXEC;
+ return vma->vm_file && vma_test(vma, VMA_MAYEXEC_BIT) &&
+ !vma_test_any_mask(vma, forbidden);
}
static unsigned long offset_to_vaddr(struct vm_area_struct *vma, loff_t offset)@@ -286,7 +288,7 @@ static bool valid_ref_ctr_vma(struct uprobe *uprobe,
return uprobe->ref_ctr_offset &&
vma->vm_file &&
file_inode(vma->vm_file) == uprobe->inode &&
- (vma->vm_flags & (VM_WRITE|VM_SHARED)) == VM_WRITE &&
+ vma_test(vma, VMA_WRITE_BIT) && !vma_test(vma, VMA_SHARED_BIT) &&
vma->vm_start <= vaddr &&
vma->vm_end > vaddr;
}
@@ -1607,7 +1609,7 @@ int uprobe_mmap(struct vm_area_struct *vma)
return 0;
if (vma->vm_file &&
- (vma->vm_flags & (VM_WRITE|VM_SHARED)) == VM_WRITE &&
+ vma_test(vma, VMA_WRITE_BIT) && !vma_test(vma, VMA_SHARED_BIT) &&
mm_flags_test(MMF_HAS_UPROBES, vma->vm_mm))
delayed_ref_ctr_inc(vma);
--
2.56.0