From patchwork Wed Apr 5 19:18:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9665525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5899560353 for ; Wed, 5 Apr 2017 19:19:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42FFE280B0 for ; Wed, 5 Apr 2017 19:19:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36B54285AB; Wed, 5 Apr 2017 19:19:01 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 A60F0280B0 for ; Wed, 5 Apr 2017 19:19:00 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=b4dPqe8zteKaeOpisgNSYG2NkbYdJmyptb/p53ZLC98=; b=FZ4 WNG+bzOPWV4OUOTMocSw9fbCsM518wZb1pe5YyQvn450wc9eN2R9w4WR8CuwPiGoZ5owGx8xch6BL VwOVbYRMs4JZIXYnNnvME28c9bZ6H3wYBzRbAFFzW5O96na7fI0sSpHGUQaid9eDqXU/M3ZL9FqVu lCIV+M6/Za0P2fqZrbp07EeuNtZMME3MX7yLMLP4Sk/S2BV5vhv8tHXiHfX/Oc50qBIXA7CXypcHJ uxUStfL2Kt9emrhHr2/mQ0PYMNtqA2VVaNF3T7BY0lOJW6Ik4yqXuChxVcanEDhdIQmJL0gLhvJ77 GizdejCrKWubsaK/h/4gGaTZcqs3aGg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cvqSJ-0005wp-GF; Wed, 05 Apr 2017 19:18:59 +0000 Received: from mail-pg0-x22f.google.com ([2607:f8b0:400e:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvqSE-0005w5-TL for linux-arm-kernel@lists.infradead.org; Wed, 05 Apr 2017 19:18:57 +0000 Received: by mail-pg0-x22f.google.com with SMTP id 81so13301234pgh.2 for ; Wed, 05 Apr 2017 12:18:34 -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; bh=f38opkrS45f9GAdxb+IW+sYhFXPM6ckxrJp68JGYujs=; b=j21JeHvz/KrpIqNibvcasv6u2O+BSgnmGAOnMJqwv8dhHC4YdY0NdGQrpp75pz6cXE uag+ZziXlzuWEmVvNXeDmF4al0WZPYm0wshNEcPbVeyAWRlErXvOJOc4VGpAZ31wnsKv dklUdx1PNmYa+elebrUja6y/8QWkQIrauiVUo= 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; bh=f38opkrS45f9GAdxb+IW+sYhFXPM6ckxrJp68JGYujs=; b=tdEo4cMxXKSRRISlOIVBVdE5ZuvqFeQNTusG6vc0FD7lKnI7yNQe4VqEPrJW+2yCPA f3PA3N/9ekqSrs0NFi6whfn9/RRq6YGKXw55CWkTyRK3Onl6z91QC1DFODAhi+/iSoug 2KRD132esHzQ1i4byGvMXncY6x3n04xVrdScwm/d+SIz5GrL3v8K0nkJsMb8hWmxB+Ku 5DzZHHzWxEjnYINO09+2XVQVr0V2+XgSysBWVs8yX6YJanXVwTA47JtXL5oGv32rmAN5 Xnhzvid8RmGOCpkhm67mv9tdP57mb/gMCeXY+lOGHSlRceTN1V+ENzY+DJcVR+cQe8tQ v4fQ== X-Gm-Message-State: AFeK/H2VE/YozokmkikzJ/0noJQMJL7pY4yAPFhGoqXy/o7Mt25oBBFgzt9Zr/4yChk7rxiu X-Received: by 10.99.42.78 with SMTP id q75mr31986977pgq.144.1491419913655; Wed, 05 Apr 2017 12:18:33 -0700 (PDT) Received: from localhost.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id s14sm8629929pgs.0.2017.04.05.12.18.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 12:18:32 -0700 (PDT) From: Stephen Boyd To: Catalin Marinas , Will Deacon Subject: [PATCH v4] arm64: print a fault message when attempting to write RO memory Date: Wed, 5 Apr 2017 12:18:31 -0700 Message-Id: <20170405191831.8246-1-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.10.0.297.gf6727b0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170405_121855_110290_CF583E6F X-CRM114-Status: GOOD ( 17.14 ) 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: Mark Rutland , Laura Abbott , James Morse , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 If a page is marked read only we should print out that fact, instead of printing out that there was a page fault. Right now we get a cryptic error message that something went wrong with an unhandled fault, but we don't evaluate the esr to figure out that it was a read/write permission fault. Instead of seeing: Unable to handle kernel paging request at virtual address ffff000008e460d8 pgd = ffff800003504000 [ffff000008e460d8] *pgd=0000000083473003, *pud=0000000083503003, *pmd=0000000000000000 Internal error: Oops: 9600004f [#1] PREEMPT SMP we'll see: Unable to handle kernel write to read-only memory at virtual address ffff000008e760d8 pgd = ffff80003d3de000 [ffff000008e760d8] *pgd=0000000083472003, *pud=0000000083435003, *pmd=0000000000000000 Internal error: Oops: 9600004f [#1] PREEMPT SMP We also add a userspace address check into is_permission_fault() so that the function doesn't return true for ttbr0 PAN faults when it shouldn't. Reviewed-by: James Morse Tested-by: James Morse Acked-by: Laura Abbott Cc: Mark Rutland Signed-off-by: Stephen Boyd --- Changes from v3: * Don't drop addr check in do_page_fault() (James Morse) Changes from v2: * Fold addr check into is_permission_fault() (James Morse) Changes from v1: * Move into __do_kernel_fault() (Mark Rutland) arch/arm64/mm/fault.c | 55 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 156169c6981b..3bde99769679 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -160,12 +160,33 @@ static bool is_el1_instruction_abort(unsigned int esr) return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR; } +static inline bool is_permission_fault(unsigned int esr, struct pt_regs *regs, + unsigned long addr) +{ + unsigned int ec = ESR_ELx_EC(esr); + unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE; + + if (ec != ESR_ELx_EC_DABT_CUR && ec != ESR_ELx_EC_IABT_CUR) + return false; + + if (fsc_type == ESR_ELx_FSC_PERM) + return true; + + if (addr < USER_DS && system_uses_ttbr0_pan()) + return fsc_type == ESR_ELx_FSC_FAULT && + (regs->pstate & PSR_PAN_BIT); + + return false; +} + /* * The kernel tried to access some page that wasn't present. */ static void __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int esr, struct pt_regs *regs) { + const char *msg; + /* * Are we prepared to handle this kernel fault? * We are almost certainly not prepared to handle instruction faults. @@ -177,9 +198,20 @@ static void __do_kernel_fault(struct mm_struct *mm, unsigned long addr, * No handler, we'll have to terminate things with extreme prejudice. */ bust_spinlocks(1); - pr_alert("Unable to handle kernel %s at virtual address %08lx\n", - (addr < PAGE_SIZE) ? "NULL pointer dereference" : - "paging request", addr); + + if (is_permission_fault(esr, regs, addr)) { + if (esr & ESR_ELx_WNR) + msg = "write to read-only memory"; + else + msg = "read from unreadable memory"; + } else if (addr < PAGE_SIZE) { + msg = "NULL pointer dereference"; + } else { + msg = "paging request"; + } + + pr_alert("Unable to handle kernel %s at virtual address %08lx\n", msg, + addr); show_pte(mm, addr); die("Oops", regs, esr); @@ -269,21 +301,6 @@ static int __do_page_fault(struct mm_struct *mm, unsigned long addr, return fault; } -static inline bool is_permission_fault(unsigned int esr, struct pt_regs *regs) -{ - unsigned int ec = ESR_ELx_EC(esr); - unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE; - - if (ec != ESR_ELx_EC_DABT_CUR && ec != ESR_ELx_EC_IABT_CUR) - return false; - - if (system_uses_ttbr0_pan()) - return fsc_type == ESR_ELx_FSC_FAULT && - (regs->pstate & PSR_PAN_BIT); - else - return fsc_type == ESR_ELx_FSC_PERM; -} - static bool is_el0_instruction_abort(unsigned int esr) { return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_LOW; @@ -321,7 +338,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, mm_flags |= FAULT_FLAG_WRITE; } - if (addr < USER_DS && is_permission_fault(esr, regs)) { + if (addr < USER_DS && is_permission_fault(esr, regs, addr)) { /* regs->orig_addr_limit may be 0 if we entered from EL0 */ if (regs->orig_addr_limit == KERNEL_DS) die("Accessing user space memory with fs=KERNEL_DS", regs, esr);