From patchwork Mon Dec 4 14:26:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10090509 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 627F160327 for ; Mon, 4 Dec 2017 14:26:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7AC28707 for ; Mon, 4 Dec 2017 14:26:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F495288B6; Mon, 4 Dec 2017 14:26:53 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 57C2E28707 for ; Mon, 4 Dec 2017 14:26:52 +0000 (UTC) Received: (qmail 27965 invoked by uid 550); 4 Dec 2017 14:26:50 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 27946 invoked from network); 4 Dec 2017 14:26:50 -0000 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=gDpiVmArcwV2N+3IB2ytxYYY+eoa+xP82IGtLUtqWoM=; b=WDzuWe+V6+p/F8uGFTR48HDhx+nq02ZGfVQUBLAkKZeEHXAcsR+TAnt0nG8P+lVvAt n+8Bg2O0S8jlVTYAreOezAa2XDc+ISOOi23qg5dESZuWmcYQaZIKW5dQ1vxkIk8EsWvo GKxAA7B8zHOfsU+ocjRNZ3QUA+7Sb3b9mKu+sgvPo6nvTTxNupACHsQ3ALgJ77vpZhsr uleWRh9J9HrAhR2D0yUWLL8amYJ1cRFJEd3U4IctGVrj1R7oJJZBXGQRalWbPggx7ebT 3R+pX8YyX3zzfaKmanM3B/Cz0OcgIc1sWNKp33ifJoT2CvJtDTCwwUfIQxs01Rnybdy5 a3Ug== 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=gDpiVmArcwV2N+3IB2ytxYYY+eoa+xP82IGtLUtqWoM=; b=eIEmFUbS7arzkUMlGVkgtTCl0usnxC+HSGrqizZUskkUFQ+MCLWB7zDeb69Qit/cyK QoT7YjETixKyNSZyCws6p0JswoMYvWrw2swZ/oibA6COkKBleR4/BebND5nKdGB6JOnf wrys5KVQQ2p+TWWRMv1HclEFHX0uSdT4AIr0trCWef/JC7h/hzPR3pNbWN4fQ2FY3AjO DRmKTyQa90SYV6ww0zsoSk0xkVa5ZvHob/2cSPTPpZUJtfMH3zhQIWtQrPEi55jo2xVL whiyh9tNdTKBJhR/WJ9AaUSJlk1O6mEH5O1lZsNI1MW78Cz/dncABTAYsnz49GPxSP4+ HjAw== X-Gm-Message-State: AJaThX5mqf+tW/JWYAIyV6f6K2UlYLHa02nHsw5NGGZ9yxtwM0L1i5fM giZitJqRqXngBeWg0Bf3jFg= X-Google-Smtp-Source: AGs4zMZOBSevqQVufypxLuJ5vPKw+US7QWHYV4xEkyxTF395mF3WyyeyhopvQWA4cxwYiep456rSCA== X-Received: by 10.84.245.149 with SMTP id j21mr14817072pll.315.1512397598441; Mon, 04 Dec 2017 06:26:38 -0800 (PST) Date: Mon, 4 Dec 2017 23:26:31 +0900 From: Jinbum Park To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Cc: afzal.mohd.ma@gmail.com, mark.rutland@arm.com, labbott@redhat.com, linux@armlinux.org.uk, gregkh@linuxfoundation.org, keescook@chromium.org, vladimir.murzin@arm.com, arnd@arndb.de Message-ID: <20171204142631.GA3359@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [kernel-hardening][PATCH v3 2/3] arm: mm: dump: make the page table dumping seq_file optional 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")) Signed-off-by: Jinbum Park Acked-by: Kees Cook --- v3: No changes 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;