[PATCH v3 3/4] selinux: use vma_is_initial_stack() and vma_is_initial_heap()

[Kefeng Wang]

Use the helpers to simplify code.

Cc: Paul Moore <p...@paul-moore.com>
Cc: Stephen Smalley <stephen.smalley.w...@gmail.com>
Cc: Eric Paris <epa...@parisplace.org>
Acked-by: Paul Moore <p...@paul-moore.com>
Reviewed-by: David Hildenbrand <da...@redhat.com>
Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 security/selinux/hooks.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c87b79a29fad..ac582c046c51 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3800,13 +3800,10 @@ static int selinux_file_mprotect(struct vm_area_struct 
*vma,
        if (default_noexec &&
            (prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
                int rc = 0;
-               if (vma->vm_start >= vma->vm_mm->start_brk &&
-                   vma->vm_end <= vma->vm_mm->brk) {
+               if (vma_is_initial_heap(vma)) {
                        rc = avc_has_perm(sid, sid, SECCLASS_PROCESS,
                                          PROCESS__EXECHEAP, NULL);
-               } else if (!vma->vm_file &&
-                          ((vma->vm_start <= vma->vm_mm->start_stack &&
-                            vma->vm_end >= vma->vm_mm->start_stack) ||
+               } else if (!vma->vm_file && (vma_is_initial_stack(vma) ||
                            vma_is_stack_for_current(vma))) {
                        rc = avc_has_perm(sid, sid, SECCLASS_PROCESS,
                                          PROCESS__EXECSTACK, NULL);
-- 
2.41.0