From patchwork Mon Oct 15 11:16:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 148816 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3662552lji; Mon, 15 Oct 2018 04:16:20 -0700 (PDT) X-Google-Smtp-Source: ACcGV62AT/rm4WuKuYIDe9IUFPSa3vKwMf0z3JXYnqIl0wz57uX+XGD2AGofo4FzMknHIl24J2ib X-Received: by 2002:a17:902:760b:: with SMTP id k11-v6mr16822128pll.103.1539602180676; Mon, 15 Oct 2018 04:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539602180; cv=none; d=google.com; s=arc-20160816; b=0LxSIS6KRLKOo1TjM/ruP3gB6u+x/T09F+h0a+6qgABodfAr5SwegssAme4Stc5/ro GrpbnwJpUkYDi3GKOsxI9xV4V9lfUsp16rIgfFZ3vzzeNGDFhwgTEoTdFtybPjCea+Iw 9znyZB04M1htp5PHXwfVdM0WdbiNOzclD9koUQQx74OWv2k4/EYVZlOSe7BWuBrHFgc0 RB8gUQeMOYVoJfcHV6vcu8c+Th1UKdkVnxrcHFGuGwQ1SnLMEEP6cquQdieORMf85KVw lS/We7ed+McT89ecRMwwua3jaHRYULPxAT5EuLnXINxAbKG8UL+1zo/U8aFxJQUUwH+Y cMuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=KapoO5oMlMVFKcdCw43NU78fcYlzzKItuvdaDSjvtEY=; b=0BB1hobwlIQ64Jy+tTXJ4GsFJh5ojBOLR0SJ1BDVCk+O5CHq3iPSPbtdCRznUaLJjh h7KCopy59Kf71TfIt5guiWCzbsjSDReT8LBrYNCevY30FfH20C3cpE/8zDM9hYkuYjEy guriCwQFTqmnfsv5PQLUSpIlXfhrJjdG+TcWO6gv9+PODDY/liUkyXKoMMkw6RPEjNpU 9R+RX85BYMSjRgv6IkOB4rJ9QLmemTnDtEiwDHpBXCjBsSzXMM+E1XEiRls2I0z3ArF1 GJJAi02EqWbrdxfU6njdmJBaCt65x+L1QXXofM0BjoDJCSlqxUNKsi7bWjRrPbnSY0OQ FewQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhoK4P32; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11-v6si9933389pgf.587.2018.10.15.04.16.20; Mon, 15 Oct 2018 04:16:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhoK4P32; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726649AbeJOTBF (ORCPT + 32 others); Mon, 15 Oct 2018 15:01:05 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:38092 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbeJOTBF (ORCPT ); Mon, 15 Oct 2018 15:01:05 -0400 Received: by mail-lj1-f196.google.com with SMTP id v7-v6so17121680ljg.5 for ; Mon, 15 Oct 2018 04:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KapoO5oMlMVFKcdCw43NU78fcYlzzKItuvdaDSjvtEY=; b=jhoK4P329uM4OgPNBuc+W4XSTNdyijGPQ7tYXpsRzwvnf5sOZn/JeUQlKJbUcBStJC p/KX2drpls/0XTsbU1BTUYGyxuilNKYAC03yGhrOyAD34HGaFqh/sSi6WwkPghYr/IaU kObhyOVBHUK8Wl3202Elwoa4wUyTLHttFT9S8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KapoO5oMlMVFKcdCw43NU78fcYlzzKItuvdaDSjvtEY=; b=lZJFW3QzmrsUXTI5SSuEDxre7fVWMN4L/TnDRFZmCEAjF5pssW/4Zxsr+4QBNr2H7s Z19Ne02YTEdQJBccAAtkXkjrYxzuj+lV4n9RkUfdnRfFKxxg+/8sd5GbqetOiExe1ctv 3ZQ1H3LaP0lSHjP/qKB2/ZL+sfHjSKyLjZ00u44KKyaQcHy5gvh5CQF7NB3d5bZcNHgV JoKie3insVnXnjF5MNlYDXL9Ydq0cytQtLf4YdyQSYdAf/YsuB/aW0Xm8BvHXeJpw8/t 7Q99ByPLhUPmJqTXbFjj9Cs3zwGpQVUWUOiJNc/DihdXBJzsiiZhofrBd6lHXYxQ+Zm8 vRNg== X-Gm-Message-State: ABuFfohZc8Q+uyaYJlx7lrvl1nrEdqCetZcYfUIwsCwP7R5KkKYtCTFR jj/D8pfNAMkZiQtqLlRbeHbpLzic17Q= X-Received: by 2002:a2e:8606:: with SMTP id a6-v6mr9222957lji.43.1539602175125; Mon, 15 Oct 2018 04:16:15 -0700 (PDT) Received: from localhost (c-732171d5.07-21-73746f28.bbcust.telenor.se. [213.113.33.115]) by smtp.gmail.com with ESMTPSA id l9-v6sm2277055ljb.70.2018.10.15.04.16.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:16:14 -0700 (PDT) From: Anders Roxell To: catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Anders Roxell , Arnd Bergmann , Ard Biesheuvel , Laura Abbott Subject: [PATCH] arm64: kprobe: make page to RO mode when allocate it Date: Mon, 15 Oct 2018 13:16:00 +0200 Message-Id: <20181015111600.5479-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 1404d6f13e47 ("arm64: dump: Add checking for writable and exectuable pages") has successfully identified code that leaves a page with W+X permissions. [ 3.245140] arm64/mm: Found insecure W+X mapping at address (____ptrval____)/0xffff000000d90000 [ 3.245771] WARNING: CPU: 0 PID: 1 at ../arch/arm64/mm/dump.c:232 note_page+0x410/0x420 [ 3.246141] Modules linked in: [ 3.246653] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.0-rc5-next-20180928-00001-ge70ae259b853-dirty #62 [ 3.247008] Hardware name: linux,dummy-virt (DT) [ 3.247347] pstate: 80000005 (Nzcv daif -PAN -UAO) [ 3.247623] pc : note_page+0x410/0x420 [ 3.247898] lr : note_page+0x410/0x420 [ 3.248071] sp : ffff00000804bcd0 [ 3.248254] x29: ffff00000804bcd0 x28: ffff000009274000 [ 3.248578] x27: ffff00000921a000 x26: ffff80007dfff000 [ 3.248845] x25: ffff0000093f5000 x24: ffff000009526f6a [ 3.249109] x23: 0000000000000004 x22: ffff000000d91000 [ 3.249396] x21: ffff000000d90000 x20: 0000000000000000 [ 3.249661] x19: ffff00000804bde8 x18: 0000000000000400 [ 3.249924] x17: 0000000000000000 x16: 0000000000000000 [ 3.250271] x15: ffffffffffffffff x14: 295f5f5f5f6c6176 [ 3.250594] x13: 7274705f5f5f5f28 x12: 2073736572646461 [ 3.250941] x11: 20746120676e6970 x10: 70616d20582b5720 [ 3.251252] x9 : 6572756365736e69 x8 : 3039643030303030 [ 3.251519] x7 : 306666666678302f x6 : ffff0000095467b2 [ 3.251802] x5 : 0000000000000000 x4 : 0000000000000000 [ 3.252060] x3 : 0000000000000000 x2 : ffffffffffffffff [ 3.252323] x1 : 4d151327adc50b00 x0 : 0000000000000000 [ 3.252664] Call trace: [ 3.252953] note_page+0x410/0x420 [ 3.253186] walk_pgd+0x12c/0x238 [ 3.253417] ptdump_check_wx+0x68/0xf8 [ 3.253637] mark_rodata_ro+0x68/0x98 [ 3.253847] kernel_init+0x38/0x160 [ 3.254103] ret_from_fork+0x10/0x18 Reworked to that when allocate a page it sets mode RO. Inspired by commit 63fef14fc98a ("kprobes/x86: Make insn buffer always ROX and use text_poke()"). Cc: Arnd Bergmann Cc: Ard Biesheuvel Cc: Laura Abbott Cc: Catalin Marinas Co-developed-by: Arnd Bergmann Co-developed-by: Ard Biesheuvel Signed-off-by: Anders Roxell --- arch/arm64/kernel/probes/kprobes.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) -- 2.19.1 Acked-by: Masami Hiramatsu Reviewed-by: Laura Abbott diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index 9b65132e789a..b842e908b423 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -23,7 +23,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -42,10 +44,21 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); static void __kprobes post_kprobe_handler(struct kprobe_ctlblk *, struct pt_regs *); +static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode) +{ + void *addrs[1]; + u32 insns[1]; + + addrs[0] = (void *)addr; + insns[0] = (u32)opcode; + + return aarch64_insn_patch_text(addrs, insns, 1); +} + static void __kprobes arch_prepare_ss_slot(struct kprobe *p) { /* prepare insn slot */ - p->ainsn.api.insn[0] = cpu_to_le32(p->opcode); + patch_text(p->ainsn.api.insn, p->opcode); flush_icache_range((uintptr_t) (p->ainsn.api.insn), (uintptr_t) (p->ainsn.api.insn) + @@ -118,15 +131,15 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) return 0; } -static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode) +void *alloc_insn_page(void) { - void *addrs[1]; - u32 insns[1]; + void *page; - addrs[0] = (void *)addr; - insns[0] = (u32)opcode; + page = vmalloc_exec(PAGE_SIZE); + if (page) + set_memory_ro((unsigned long)page & PAGE_MASK, 1); - return aarch64_insn_patch_text(addrs, insns, 1); + return page; } /* arm kprobe: install breakpoint in text */