From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: "Christian Göttsche" <cgzones@googlemail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
<amd-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
<linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>,
<linux-perf-users@vger.kernel.org>, <selinux@vger.kernel.org>,
Paul Moore <paul@paul-moore.com>,
Stephen Smalley <stephen.smalley.work@gmail.com>,
Eric Paris <eparis@parisplace.org>
Subject: Re: [PATCH v2 3/4] selinux: use vma_is_initial_stack() and vma_is_initial_heap()
Date: Wed, 19 Jul 2023 18:22:29 +0800 [thread overview]
Message-ID: <dc8223db-b4ac-7bee-6f89-63475a7dcaf8@huawei.com> (raw)
In-Reply-To: <CAJ2a_DfGvPeDuN38UBXD4f2928n9GZpHFgdiPo9MoSAY7YXeOg@mail.gmail.com>
On 2023/7/19 17:02, Christian Göttsche wrote:
> On Wed, 19 Jul 2023 at 09:40, Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>>
>> Use the helpers to simplify code.
>>
>> Cc: Paul Moore <paul@paul-moore.com>
>> Cc: Stephen Smalley <stephen.smalley.work@gmail.com>
>> Cc: Eric Paris <eparis@parisplace.org>
>> Acked-by: Paul Moore <paul@paul-moore.com>
>> Signed-off-by: Kefeng Wang <wangkefeng.wang@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 d06e350fedee..ee8575540a8e 100644
>> --- a/security/selinux/hooks.c
>> +++ b/security/selinux/hooks.c
>> @@ -3762,13 +3762,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)) {
>
> This seems to change the condition from
>
> vma->vm_start >= vma->vm_mm->start_brk && vma->vm_end <= vma->vm_mm->brk
>
> to
>
> vma->vm_start <= vma->vm_mm->brk && vma->vm_end >= vma->vm_mm->start_brk
>
> (or AND arguments swapped)
>
> vma->vm_end >= vma->vm_mm->start_brk && vma->vm_start <= vma->vm_mm->brk
>
> Is this intended?
The new condition is to check whether there is intersection between
[startbrk,brk] and [vm_start,vm_end], it contains orignal check, so
I think it is ok, but for selinux check, I am not sure if there is
some other problem.
>
>> 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.27.0
>>
next prev parent reply other threads:[~2023-07-19 10:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 7:51 [PATCH v2 0/4] mm: convert to vma_is_initial_heap/stack() Kefeng Wang
2023-07-19 7:51 ` [PATCH v2 1/4] mm: factor out VMA stack and heap checks Kefeng Wang
2023-07-19 8:18 ` David Hildenbrand
2023-07-19 7:51 ` [PATCH v2 2/4] drm/amdkfd: use vma_is_initial_stack() and vma_is_initial_heap() Kefeng Wang
2023-07-19 8:18 ` David Hildenbrand
2023-07-19 14:24 ` Felix Kuehling
2023-07-19 7:51 ` [PATCH v2 3/4] selinux: " Kefeng Wang
2023-07-19 8:18 ` David Hildenbrand
2023-07-19 9:02 ` Christian Göttsche
2023-07-19 10:22 ` Kefeng Wang [this message]
2023-07-19 15:25 ` Paul Moore
2023-07-20 8:28 ` Kefeng Wang
2023-07-20 21:16 ` Paul Moore
2023-07-19 7:51 ` [PATCH v2 4/4] perf/core: " Kefeng Wang
2023-07-19 8:21 ` David Hildenbrand
2023-07-19 9:29 ` Peter Zijlstra
2023-07-19 10:26 ` Kefeng Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dc8223db-b4ac-7bee-6f89-63475a7dcaf8@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=cgzones@googlemail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eparis@parisplace.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).