From patchwork Thu Dec 7 10:53:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10098413 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 E149360325 for ; Thu, 7 Dec 2017 10:54:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8D222A419 for ; Thu, 7 Dec 2017 10:54:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCEF02A41B; Thu, 7 Dec 2017 10:54:31 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED 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 6948F2A41B for ; Thu, 7 Dec 2017 10:54:31 +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:Subject:To:From :Date: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=23q6EEBnYmx2MAv7XdFUfbCS5GLYnL95WQDyOmJ9wNg=; b=M3hsVzme1VQoMk +mRQliKAYwWqLEghIurH72GiCGdkyIpisz6gUsg+W9LWXQMM476gViWPjavrq2owR+2V8UiWhyFIP 73bRizgh+lVSelz+u+KIJ+hb3tAYFHGKjVbBaEXMd4b8vFUzTFfNLUkv6GYlfSiQ36Z0eSMEPRvZP ZtJ793bIagfl4oAxO7cIXKnyaC315cW45DnFZNIG4zHZpjBHP/0Fa3AgW5Lu/N7gRXGRnlRmJu1c0 vK/VJ82nhhY+dKUYyjLt1ezjQl5b1kkn3Ybj2t4bgLKkDtxiDSOb3XoPPhwAr1MoByrLS2jdHXyAF z0ry0ZdI5dQwNxaPXbsQ==; 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 1eMtp0-0008UD-NX; Thu, 07 Dec 2017 10:54:30 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMtov-0008BK-57 for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 10:54:28 +0000 Received: by mail-pg0-x243.google.com with SMTP id b18so4213526pgv.10 for ; Thu, 07 Dec 2017 02:54:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=rt79UTf5a9lokqGq/LDawwltQYi7ea8wicWo1jZaonw=; b=BUS9cZwYTMfm3bgzDssKQGuQ8GuX5/Psx9y9V9ZB1WSQbrwpQp42luMDodD0jg31/G vdYRbmYKtoWiQAEH2u1dVHXDxoViJlwV9EINNPFU21fhgTtEFPeaa+O2rrlVptnfhaxZ m46jLSvePMHms80t1nnnf0Z82fdL/1AW6ti7uSFLonsiSHkm88DTLSQ9rR10vpgQtoZZ uu/WWbKWawuo3ek1t6+AyloWuYeutO0riF7ayuSw/UMxGFTaBBH3J+jYBTjJxK7Ynf+9 9TU5toPffd+iz61zRgH4vrPW1yziL0otfeDK9/ATxfo7cqbUl7pBGCB6H7uQyYPNcKbZ BUeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=rt79UTf5a9lokqGq/LDawwltQYi7ea8wicWo1jZaonw=; b=It1A514cWBl/nWpDBfBDILKLIrDRdRiRxsgeQLOpP8QZvVRFnPS6TAQ6MGv6N9U870 5twZMMiBmNwW0sINfNt2vVQOlWEAaiK2TvXqXmPeAW2aLe14uGP7c1TuOqTrtH2nMoPg eQnypLQXQ/BGbzFGNCyxGJboJeZYRf7vdG/zZiaDWoNi3JGTKYC2sOxaT0LEh2NpH+cY oHe8YohBuXd2+CRlk6OsVBc0G9HKNQnou70GVEi4AtnT5ktiqQ8Uuh8snjhrirBCZF+9 ZNtiWir7SO7TO04ubVAYwo/PN0EBQcPI4PRjaxoAbhV+AQruVXuuc9iUO+n0vVkRiiZi ELnw== X-Gm-Message-State: AJaThX4TevYaqkxOlCfJ8UAzUXRRzRN8YH+We2ZbRZEX9XJnBgI1r6KU qwgFVwzhiWTO6n747GE/lDv9CA== X-Google-Smtp-Source: AGs4zMaIP2Kqld1OreF9c9C7r4l7tUD+ojlrpUSKsO+/ZkvZPjfqGFYxBhJRO6patfpj9QwwhZabgg== X-Received: by 10.101.93.136 with SMTP id f8mr23930732pgt.291.1512644044437; Thu, 07 Dec 2017 02:54:04 -0800 (PST) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id s65sm9861722pfk.7.2017.12.07.02.54.01 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 02:54:03 -0800 (PST) Date: Thu, 7 Dec 2017 19:53:57 +0900 From: Jinbum Park To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [kernel-hardening][PATCH v5 2/3] arm: mm: dump: make the page table dumping seq_file optional Message-ID: <20171207105357.GA10089@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_025425_350664_708EE53C X-CRM114-Status: GOOD ( 12.38 ) 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@arm.com, vladimir.murzin@arm.com, keescook@chromium.org, arnd@arndb.de, gregkh@linuxfoundation.org, linux@armlinux.org.uk, labbott@redhat.com, afzal.mohd.ma@gmail.com 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 This patch makes the page table dumping seq_file optional. It makes the page table dumping code usable for other cases. This patch refers below commit of arm64. (ae5d1cf358a5 ("arm64: dump: Make the page table dumping seq_file optional")) Tested-by: Laura Abbott Reviewed-by: Laura Abbott Acked-by: Kees Cook Signed-off-by: Jinbum Park --- v5: No changes (Just add Tested-by, Reviewed-by from Laura Abbott) --- arch/arm/mm/dump.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c index 8dfe7c3..43a2bee 100644 --- a/arch/arm/mm/dump.c +++ b/arch/arm/mm/dump.c @@ -34,6 +34,18 @@ { -1, NULL }, }; +#define pt_dump_seq_printf(m, fmt, args...) \ +({ \ + if (m) \ + seq_printf(m, fmt, ##args); \ +}) + +#define pt_dump_seq_puts(m, fmt) \ +({ \ + if (m) \ + seq_printf(m, fmt); \ +}) + struct pg_state { struct seq_file *seq; const struct addr_marker *marker; @@ -210,7 +222,7 @@ static void dump_prot(struct pg_state *st, const struct prot_bits *bits, size_t s = bits->clear; if (s) - seq_printf(st->seq, " %s", s); + pt_dump_seq_printf(st->seq, " %s", s); } } @@ -224,7 +236,7 @@ static void note_page(struct pg_state *st, unsigned long addr, st->level = level; st->current_prot = prot; st->current_domain = domain; - seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); + pt_dump_seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); } else if (prot != st->current_prot || level != st->level || domain != st->current_domain || addr >= st->marker[1].start_address) { @@ -232,7 +244,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned long delta; if (st->current_prot) { - seq_printf(st->seq, "0x%08lx-0x%08lx ", + pt_dump_seq_printf(st->seq, "0x%08lx-0x%08lx ", st->start_address, addr); delta = (addr - st->start_address) >> 10; @@ -240,17 +252,19 @@ static void note_page(struct pg_state *st, unsigned long addr, delta >>= 10; unit++; } - seq_printf(st->seq, "%9lu%c", delta, *unit); + pt_dump_seq_printf(st->seq, "%9lu%c", delta, *unit); if (st->current_domain) - seq_printf(st->seq, " %s", st->current_domain); + pt_dump_seq_printf(st->seq, " %s", + st->current_domain); if (pg_level[st->level].bits) dump_prot(st, pg_level[st->level].bits, pg_level[st->level].num); - seq_printf(st->seq, "\n"); + pt_dump_seq_printf(st->seq, "\n"); } if (addr >= st->marker[1].start_address) { st->marker++; - seq_printf(st->seq, "---[ %s ]---\n", st->marker->name); + pt_dump_seq_printf(st->seq, "---[ %s ]---\n", + st->marker->name); } st->start_address = addr; st->current_prot = prot;