From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yu-cheng Yu Subject: [PATCH 08/10] mm: Prevent mremap of shadow stack Date: Thu, 7 Jun 2018 07:38:05 -0700 Message-ID: <20180607143807.3611-9-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/mremap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/mremap.c b/mm/mremap.c index 049470aa1e3e..70f20edb248e 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -525,7 +525,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long, new_addr) { struct mm_struct *mm = current->mm; - struct vm_area_struct *vma; + struct vm_area_struct *vma = find_vma(mm, addr); unsigned long ret = -EINVAL; unsigned long charged = 0; bool locked = false; @@ -533,6 +533,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, LIST_HEAD(uf_unmap_early); LIST_HEAD(uf_unmap); + if (vma->vm_flags & VM_SHSTK) + return ret; + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) return ret; -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:36344 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934604AbeFGOlg (ORCPT ); Thu, 7 Jun 2018 10:41:36 -0400 From: Yu-cheng Yu Subject: [PATCH 08/10] mm: Prevent mremap of shadow stack Date: Thu, 7 Jun 2018 07:38:05 -0700 Message-ID: <20180607143807.3611-9-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: <20180607143805.bR_8TObK6z561m8bgoZPbgOqbYgm3QvogEW4xeD_hRo@z> Signed-off-by: Yu-cheng Yu --- mm/mremap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/mremap.c b/mm/mremap.c index 049470aa1e3e..70f20edb248e 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -525,7 +525,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long, new_addr) { struct mm_struct *mm = current->mm; - struct vm_area_struct *vma; + struct vm_area_struct *vma = find_vma(mm, addr); unsigned long ret = -EINVAL; unsigned long charged = 0; bool locked = false; @@ -533,6 +533,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, LIST_HEAD(uf_unmap_early); LIST_HEAD(uf_unmap); + if (vma->vm_flags & VM_SHSTK) + return ret; + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) return ret; -- 2.15.1