[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20201130053037.27006-1-tesheng@andestech.com>
Date: Mon, 30 Nov 2020 13:30:37 +0800
From: Eric Lin <tesheng@...estech.com>
To: <linux-kernel@...r.kernel.org>, <linux-riscv@...ts.infradead.org>,
<walken@...gle.com>, <daniel.m.jordan@...cle.com>,
<peterx@...hat.com>, <akpm@...ux-foundation.org>,
<penberg@...nel.org>, <aou@...s.berkeley.edu>,
<palmer@...belt.com>, <paul.walmsley@...ive.com>
CC: <dslin1010@...il.com>, Eric Lin <tesheng@...estech.com>,
Alan Kao <alankao@...estech.com>
Subject: [PATCH] riscv/mm: Prevent kernel module access user-space memory without uaccess routines
In the page fault handler, an access to user-space memory
without get/put_user() or copy_from/to_user() routines is
not resolved properly. Like arm and other architectures,
we need to let it die earlier in page fault handler.
Signed-off-by: Eric Lin <tesheng@...estech.com>
Cc: Alan Kao <alankao@...estech.com>
---
arch/riscv/mm/fault.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index 3c8b9e433c67..a452cfa266a2 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -232,6 +232,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
if (user_mode(regs))
flags |= FAULT_FLAG_USER;
+ if (!user_mode(regs) && addr < TASK_SIZE && unlikely(!(regs->status & SR_SUM)))
+ die(regs, "Accessing user space memory without uaccess routines\n");
+
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr);
if (cause == EXC_STORE_PAGE_FAULT)
--
2.17.0
Powered by blists - more mailing lists