From patchwork Tue Oct 30 11:38:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10661207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAD3815E9 for ; Tue, 30 Oct 2018 16:06:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96B6E2A710 for ; Tue, 30 Oct 2018 16:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A1F92A77F; Tue, 30 Oct 2018 16:06:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0E8C02A710 for ; Tue, 30 Oct 2018 16:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8XtCeujvsFp5XGeOK6swYwIs/ukSLDrSAZ2vTp8aG2A=; b=uw/+36EhnsldiI YQVOujMXT1nc+z8lwuzTwD7Sy842prYKaBAosjexMy0m56SobkXuaynDQ7f6562h92ampU0G/Gtpr ldTDbxn2oqwhR3pWvMHwJqRAwTvUifQ9dI50pW9SCZzS5Wl1zOhrx0NjiLj3AUCZBAioU4GJZeCPp EjR38Hcq6hLHbr0fYUue3FYLrBhoBAVAwSTFI8nAM7v6H140sChj7bjwatMfR24uZFrZe7R/K+YmO WJdo4wlD518hYsnwH5OYVJWqjUgW9Xs83ENHVUad2SwCLiUoJ97ECrbWXD5KMALEeBmSWn28wNqQW zfXgdy+z8mZUzmTVWDmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHWXK-0005bz-Lz; Tue, 30 Oct 2018 16:06:34 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHVns-0006wV-No for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2018 15:19:39 +0000 Received: by mail-lj1-x243.google.com with SMTP id x85-v6so7543764ljb.2 for ; Tue, 30 Oct 2018 08:19:25 -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=m1mIk7f03+xCAPFpAQ+ri8nynizG8TXkzIRuRDPgQkU=; b=Jwuh5AsFaiuRHjYyFzL3YuMF2QbHogcYyknHZHEgVkN/+AGLQvp3iC/GrzWh4U9vue a6qsC1Y5Y0TmtvTr4qz0XEClCdkrSuU3Tcx1tY0Bd/uFoMLhqCSiQ7fbQXfKbmaFpQ/B yiU+WeM5lIhSnBKWSYJxb7HH83AMtwkGmhiq0= 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=m1mIk7f03+xCAPFpAQ+ri8nynizG8TXkzIRuRDPgQkU=; b=LkDq4r8iD4WH5cbSPLCVnATvUzDGDjKewbwNBBL8MFYracluo16rPRqu93DtkBPpUh YFKs54yEpqnpznwOSJ5Z3GpRpOyNPW1h51RoLqi5oBNQeB2DeMEnjsvU8RY6DkP3ObjD EGkswtRMlsYca1eHTG+H3XCFnKv1HxZfuciTXu11yW1HMwrXT3Hc3UObqkmuVcaXfQtJ X7htVQCxVUvJBNsVbQQBTiXy7v8FovU4jhOiCDirX1RadTddAka5CqqwD7QF9uIboLa/ NGWT+kHHqmcECGa9EN0mH0bU7mOtCSOKL+sh0Z0MPQRH45JuAlrxEgJjlrauZQe+Jwj0 YNOA== X-Gm-Message-State: AGRZ1gL/LEFfyN1eY/VKJyDNHxL5F3ErBhMvEq7AdmBE5ThFJIa1TLg5 iD/ipkqmwxDW9aOs2OXSFjoTcz2Vb92uTw== X-Google-Smtp-Source: AJdET5f8OAM3L4f2RfZI7VOFM0WM7EbKEzX7a4waecDnkysQgNZgDfxyd3tus31EDMf5SsS88MF9lA== X-Received: by 2002:a2e:45d:: with SMTP id 90-v6mr12053208lje.110.1540899540118; Tue, 30 Oct 2018 04:39:00 -0700 (PDT) Received: from localhost (c-732171d5.07-21-73746f28.bbcust.telenor.se. [213.113.33.115]) by smtp.gmail.com with ESMTPSA id d2-v6sm3593735lfc.11.2018.10.30.04.38.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 04:38:59 -0700 (PDT) From: Anders Roxell To: catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v2] arm64: kprobe: make page to RO mode when allocate it Date: Tue, 30 Oct 2018 12:38:50 +0100 Message-Id: <20181030113850.31150-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181030_081936_979243_BB91F3FE X-CRM114-Status: GOOD ( 14.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anders Roxell , masami.hiramatsu@linaro.org, Arnd Bergmann , Ard Biesheuvel , linux-kernel@vger.kernel.org, Laura Abbott , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 kprobes allocates a writable executable page with module_alloc() in order to store executable code. 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: Laura Abbott Cc: Catalin Marinas Co-developed-by: Arnd Bergmann Co-developed-by: Ard Biesheuvel Signed-off-by: Arnd Bergmann Signed-off-by: Ard Biesheuvel Signed-off-by: Anders Roxell --- arch/arm64/kernel/probes/kprobes.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index 9b65132e789a..decf483b4153 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, 1); - return aarch64_insn_patch_text(addrs, insns, 1); + return page; } /* arm kprobe: install breakpoint in text */