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: 10098411 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 B857B60325 for ; Thu, 7 Dec 2017 10:54:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A30152A417 for ; Thu, 7 Dec 2017 10:54:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97C962A419; Thu, 7 Dec 2017 10:54:21 +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 982F72A417 for ; Thu, 7 Dec 2017 10:54:20 +0000 (UTC) Received: (qmail 21895 invoked by uid 550); 7 Dec 2017 10:54:17 -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 21863 invoked from network); 7 Dec 2017 10:54:16 -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=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=KgHUYbUaMhfh13OpEPbYIPIf59O+LGpLUTRS5RFvIyXZsrns1xcq0KvhwCmsZv37nm vtyVZGxDwCnW0Yhl44300Zd2SiYGVuJyMa7KVCONGSeuvK/hBaVqppuurWDSo+66YEYP iUozkp6IRsj/g1aECVArsYJqNm38hyDvSWYuEqrVuLWIQIAB/+ofcSaRko9a3I3ZZKJv mU0sqizsb6TXJQe3oAONh/N/lvVS9v2CyWRoTt8cA/kK5o2lJVknsGk9l7VafixIq3oJ T3BVlMAs6UjygvdLob4cOmEPYqsMIF76Jo13nS07Jon4zDqk6OZ6RSUuDhE9IYQFazDE zwNg== X-Gm-Message-State: AJaThX5ZvyOtnxV8dxnChICnZaMXkefKSM+0mTw+zCnqShi+7IADD+d/ DeXw+GjNkV1+785/Ulvs1mQMzg== 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) 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 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: <20171207105357.GA10089@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [kernel-hardening][PATCH v5 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")) 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;