| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1490869877-118713-9-git-send-email-xiexiuqi@huawei.com>
Date: Thu, 30 Mar 2017 18:31:08 +0800
From: Xie XiuQi <xiexiuqi@...wei.com>
To: <christoffer.dall@...aro.org>, <marc.zyngier@....com>,
<catalin.marinas@....com>, <will.deacon@....com>,
<james.morse@....com>, <fu.wei@...aro.org>, <rostedt@...dmis.org>,
<hanjun.guo@...aro.org>, <shiju.jose@...wei.com>
CC: <linux-arm-kernel@...ts.infradead.org>,
<kvmarm@...ts.cs.columbia.edu>, <kvm@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <linux-acpi@...r.kernel.org>,
<gengdongjiu@...wei.com>, <zhengqiang10@...wei.com>,
<wuquanming@...wei.com>, <xiexiuqi@...wei.com>,
<wangxiongfeng2@...wei.com>,
Wang Xiongfeng <wangxiongfengi2@...wei.com>
Subject: [PATCH v3 8/8] arm64: exception: check shared writable page in SEI handler
From: Wang Xiongfeng <wangxiongfeng2@...wei.com>
Since SEI is asynchronous, the error data has been consumed. So we must
suppose that all the memory data current process can write are
contaminated. If the process doesn't have shared writable pages, the
process will be killed, and the system will continue running normally.
Otherwise, the system must be terminated, because the error has been
propagated to other processes running on other cores, and recursively
the error may be propagated to several another processes.
Signed-off-by: Wang Xiongfeng <wangxiongfengi2@...wei.com>
Signed-off-by: Xie XiuQi <xiexiuqi@...wei.com>
---
arch/arm64/kernel/traps.c | 149 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 144 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 99be6d8..b222589 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -34,6 +34,8 @@
#include <linux/sched/task_stack.h>
#include <linux/syscalls.h>
#include <linux/mm_types.h>
+#include <linux/swap.h>
+#include <linux/swapops.h>
#include <asm/atomic.h>
#include <asm/bug.h>
@@ -662,7 +664,144 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
[ESR_ELx_AET_CE] = "Corrected",
};
+static void shared_writable_pte_entry(pte_t *pte, unsigned long addr,
+ struct mm_walk *walk)
+{
+ int *is_shared_writable = walk->private;
+ struct vm_area_struct *vma = walk->vma;
+ struct page *page = NULL;
+ int mapcount = -1;
+
+ if (!pte_write(__pte(pgprot_val(vma->vm_page_prot))))
+ return;
+
+ if (pte_present(*pte)) {
+ page = vm_normal_page(vma, addr, *pte);
+ } else if (is_swap_pte(*pte)) {
+ swp_entry_t swpent = pte_to_swp_entry(*pte);
+
+ if (!non_swap_entry(swpent))
+ mapcount = swp_swapcount(swpent);
+ else if (is_migration_entry(swpent))
+ page = migration_entry_to_page(swpent);
+ }
+
+ if (mapcount == -1 && page)
+ mapcount = page_mapcount(page);
+ if (mapcount >= 2)
+ *is_shared_writable = 1;
+}
+
+static void shared_writable_pmd_entry(pmd_t *pmd, unsigned long addr,
+ struct mm_walk *walk)
+{
+ struct page *page;
+ int mapcount;
+ int *is_shared_writable = walk->private;
+
+ if (!pmd_write(*pmd))
+ return;
+
+ page = pmd_page(*pmd);
+ if (page) {
+ mapcount = page_mapcount(page);
+ if (mapcount >= 2)
+ *is_shared_writable = 1;
+ }
+}
+
+static int shared_writable_pte_range(pmd_t *pmd, unsigned long addr,
+ unsigned long end, struct mm_walk *walk)
+{
+ pte_t *pte;
+
+ if (pmd_trans_huge(*pmd)) {
+ shared_writable_pmd_entry(pmd, addr, walk);
+ return 0;
+ }
+
+ if (pmd_trans_unstable(pmd))
+ return 0;
+
+ pte = pte_offset_map(pmd, addr);
+ for (; addr != end; pte++, addr += PAGE_SIZE)
+ shared_writable_pte_entry(pte, addr, walk);
+ return 0;
+}
+
+#ifdef CONFIG_HUGETLB_PAGE
+static int shared_writable_hugetlb_range(pte_t *pte, unsigned long hmask,
+ unsigned long addr, unsigned long end,
+ struct mm_walk *walk)
+{
+ struct vm_area_struct *vma = walk->vma;
+ int *is_shared_writable = walk->private;
+ struct page *page = NULL;
+ int mapcount;
+
+ if (!pte_write(*pte))
+ return 0;
+
+ if (pte_present(*pte)) {
+ page = vm_normal_page(vma, addr, *pte);
+ } else if (is_swap_pte(*pte)) {
+ swp_entry_t swpent = pte_to_swp_entry(*pte);
+
+ if (is_migration_entry(swpent))
+ page = migration_entry_to_page(swpent);
+ }
+
+ if (page) {
+ mapcount = page_mapcount(page);
+
+ if (mapcount >= 2)
+ *is_shared_writable = 1;
+ }
+ return 0;
+}
+#endif
+
+/*
+ *Check whether there exists a page in mm_struct which is shared with other
+ process and writable (not COW) at the same time. 0 means existing such a page.
+ */
+int mm_shared_writable(struct mm_struct *mm)
+{
+ struct vm_area_struct *vma;
+ int is_shared_writable = 0;
+ struct mm_walk shared_writable_walk = {
+ .pmd_entry = shared_writable_pte_range,
+#ifdef CONFIG_HUGETLB_PAGE
+ .hugetlb_entry = shared_writable_hugetlb_range,
+#endif
+ .mm = mm,
+ .private = &is_shared_writable,
+ };
+
+ if (!mm)
+ return -EPERM;
+
+ vma = mm->mmap;
+ while (vma) {
+ walk_page_vma(vma, &shared_writable_walk);
+ if (is_shared_writable)
+ return 1;
+ vma = vma->vm_next;
+ }
+ return 0;
+}
+
DEFINE_PER_CPU(int, sei_in_process);
+
+/*
+ * Since SEI is asynchronous, the error data has been consumed. So we must
+ * suppose that all the memory data current process can write are
+ * contaminated. If the process doesn't have shared writable pages, the
+ * process will be killed, and the system will continue running normally.
+ * Otherwise, the system must be terminated, because the error has been
+ * propagated to other processes running on other cores, and recursively
+ * the error may be propagated to several another processes.
+ */
asmlinkage void do_sei(struct pt_regs *regs, unsigned int esr, int el)
{
int aet = ESR_ELx_AET(esr);
@@ -684,16 +823,16 @@ asmlinkage void do_sei(struct pt_regs *regs, unsigned int esr, int el)
if (el == 0 && IS_ENABLED(CONFIG_ARM64_ESB) &&
cpus_have_cap(ARM64_HAS_RAS_EXTN)) {
siginfo_t info;
- void __user *pc = (void __user *)instruction_pointer(regs);
if (aet >= ESR_ELx_AET_UEO)
return;
- if (aet == ESR_ELx_AET_UEU) {
- info.si_signo = SIGILL;
+ if (aet == ESR_ELx_AET_UEU &&
+ !mm_shared_writable(current->mm)) {
+ info.si_signo = SIGKILL;
info.si_errno = 0;
- info.si_code = ILL_ILLOPC;
- info.si_addr = pc;
+ info.si_code = 0;
+ info.si_addr = 0;
current->thread.fault_address = 0;
current->thread.fault_code = 0;
--
1.8.3.1
Powered by blists - more mailing lists