From patchwork Fri Dec 5 12:20:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 5443501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 56319BEEA8 for ; Fri, 5 Dec 2014 12:23:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F83620357 for ; Fri, 5 Dec 2014 12:23:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 483E820353 for ; Fri, 5 Dec 2014 12:23:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xwrsa-00048B-Ce; Fri, 05 Dec 2014 12:21:00 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XwrsX-00044u-98 for linux-arm-kernel@lists.infradead.org; Fri, 05 Dec 2014 12:20:58 +0000 Received: from leverpostej.cambridge.arm.com (leverpostej.cambridge.arm.com [10.1.205.151]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id sB5CKOwo028917; Fri, 5 Dec 2014 12:20:24 GMT From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: mm: dump: don't skip final region Date: Fri, 5 Dec 2014 12:20:16 +0000 Message-Id: <1417782016-11825-1-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141205_042057_636710_B6BD7EB7 X-CRM114-Status: GOOD ( 13.00 ) X-Spam-Score: -5.0 (-----) Cc: Mark Rutland , Steve Capper , Russell King , Kees Cook , Will Deacon X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the final page table entry we walk is a valid mapping, the page table dumping code will not log the region this entry is part of, as the final note_page call in walk_pgd will trigger an early return. Luckily this isn't seen on contemporary systems as they typically don't have enough RAM to extend the linear mapping right to the end of the address space. In note_page, we log a region when we reach its end (i.e. we hit an entry immediately afterwards which has different prot bits or is invalid). The final entry has no subsequent entry, so we will not log this immediately. We try to cater for this with a subsequent call to note_page in ptdump_show, but this returns early as 0 is less than USER_PGTABLES_CEILING, and hence we will skip a valid mapping if it spans to the final entry we note. Luckily, the final note_page call has level == 0, while all prior calls have a non-zero level, so if we also check level we will both skip user entries and handle the final note_page call correctly. Due to the way addr is constructed in the walk_* functions, it can never be less than LOWEST_ADDR when walking the page tables, so it is not necessary to avoid dereferencing invalid table addresses. The existing checks for st->current_prot and st->marker[1].start_address are sufficient to ensure we will not print and/or dereference garbage when trying to log information. This patch adds the aformentioned check for level, ensuring we log all regions in the kernel mappings, including those which span right to the end of the address space. Signed-off-by: Mark Rutland Cc: Kees Cook Cc: Russell King Cc: Steve Capper Cc: Will Deacon Acked-by: Steve Capper --- arch/arm/mm/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I found this via inspection, rather than being hit by the problem described above, but it seemed worthwhile to fix this up (otherwise the final note_page call is pointless). diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c index 5942493..f459c0d 100644 --- a/arch/arm/mm/dump.c +++ b/arch/arm/mm/dump.c @@ -220,7 +220,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level, u static const char units[] = "KMGTPE"; u64 prot = val & pg_level[level].mask; - if (addr < USER_PGTABLES_CEILING) + if (level && addr < USER_PGTABLES_CEILING) return; if (!st->level) {