From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yu-cheng Yu Subject: [PATCH 09/10] mm: Prevent madvise from changing shadow stack Date: Thu, 7 Jun 2018 07:38:06 -0700 Message-ID: <20180607143807.3611-10-yu-cheng.yu@intel.com> References: <20180607143807.3611-1-yu-cheng.yu@intel.com> Return-path: In-Reply-To: <20180607143807.3611-1-yu-cheng.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , "H.J. Lu" , Vedvyas Shanbhogue , "Ravi V. Shankar" , Dave Hansen , Andy Lutomirski , Jonathan Corbet , Oleg Nesterov , Arnd Bergmann , Mike Kravetz Cc: Yu-cheng Yu List-Id: linux-arch.vger.kernel.org Signed-off-by: Yu-cheng Yu --- mm/madvise.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/madvise.c b/mm/madvise.c index 4d3c922ea1a1..2a6988badd6b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -839,6 +839,14 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) if (vma && start > vma->vm_start) prev = vma; + /* + * Don't do anything on shadow stack. + */ + if (vma->vm_flags & VM_SHSTK) { + error = -EINVAL; + goto out_no_plug; + } + blk_start_plug(&plug); for (;;) { /* Still start < end. */ @@ -876,6 +884,7 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) } out: blk_finish_plug(&plug); +out_no_plug: if (write) up_write(¤t->mm->mmap_sem); else -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:36348 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934016AbeFGOlh (ORCPT ); Thu, 7 Jun 2018 10:41:37 -0400 From: Yu-cheng Yu Subject: [PATCH 09/10] mm: Prevent madvise from changing shadow stack Date: Thu, 7 Jun 2018 07:38:06 -0700 Message-ID: <20180607143807.3611-10-yu-cheng.yu@intel.com> In-Reply-To: <20180607143807.3611-1-yu-cheng.yu@intel.com> References: <20180607143807.3611-1-yu-cheng.yu@intel.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , "H.J. Lu" , Vedvyas Shanbhogue , "Ravi V. Shankar" , Dave Hansen , Andy Lutomirski , Jonathan Corbet , Oleg Nesterov , Arnd Bergmann , Mike Kravetz Cc: Yu-cheng Yu Message-ID: <20180607143806.kjEXISHLskIEt3fVD8gggO2x5TfCcOFiwAfn7fhOknY@z> Signed-off-by: Yu-cheng Yu --- mm/madvise.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mm/madvise.c b/mm/madvise.c index 4d3c922ea1a1..2a6988badd6b 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -839,6 +839,14 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) if (vma && start > vma->vm_start) prev = vma; + /* + * Don't do anything on shadow stack. + */ + if (vma->vm_flags & VM_SHSTK) { + error = -EINVAL; + goto out_no_plug; + } + blk_start_plug(&plug); for (;;) { /* Still start < end. */ @@ -876,6 +884,7 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) } out: blk_finish_plug(&plug); +out_no_plug: if (write) up_write(¤t->mm->mmap_sem); else -- 2.15.1