From patchwork Fri Dec 1 11:34:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10087089 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 30CB76037E for ; Fri, 1 Dec 2017 13:39:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13F842A52E for ; Fri, 1 Dec 2017 13:39:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 089BF2A543; Fri, 1 Dec 2017 13:39:02 +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 235952A53D for ; Fri, 1 Dec 2017 13:38:59 +0000 (UTC) Received: (qmail 3686 invoked by uid 550); 1 Dec 2017 13:36:47 -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 Delivered-To: moderator for kernel-hardening@lists.openwall.com Received: (qmail 12085 invoked from network); 1 Dec 2017 11:34:23 -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=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=Hwhp91lNRFVLwg8187v632WSpRHVDfyltmDL2HMe13ARUzrOcDzQ7ISNWgLAad77gA NjrU/BB2q48bY13LJvzA4dypwUe6eGGnFTMasmk2XZaZ0zIjvHlzkdCnvLQESzW1eflA Bpsd/+GmV/8256OAjA6PlRAOFPfwDhlkuQwAXqGez+/VX+6ffsz4f927c9uTNiW//EWD QQGTCeZ9HPHOz+R0vlUECPg02V/CiKAwSe4VsWwbMmRxRN1MD0P/XrIA+9fqjnbMXRTr LvcUlA5UOPnwLH0Z3fjNRtkThM1dr62Pvw3pG42+eNMaJLNuluoKpnz6bZuRds8brExy RkbA== 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=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=RJRaVbqMuyHf5K5dksWP3397nlWTZ9/JpoYPjDXhBfzudIBbG7QO/umrP8xEdoExcM F9oEebZ0rFovcsF99z3bab5QlJjhvRvRB8qitoDw2SAnIzpg99Qyu8pXMkA1ucRnzKj3 JIUQ4QqAuRPkJfp1UA82fQLkxk7Xqq8R1DSo1egSbzK6uifAEuWZAXiFzeOQKAt7lw9a DMMKuE/3hgaqp+I/kw+liioSJ8dGURaeN60r5b8olYQlhrXrrH/b1Zl+c7IYif7lXVlY pgSbVVNU5yOt+MHyZGY6nqRgbkr4/wSPFlFYbSI3t8zGxxvOmBZkOUi7khOpfbPHNpBX +8MQ== X-Gm-Message-State: AJaThX6JOlGYNyqj6zFyyhaml6Np7GessDbqolL29O/n7k5D/ULiPebD nqgzLNrP6islR/bgImBjyp4= X-Google-Smtp-Source: AGs4zMbHTnkWHPoUvEqUE2q1m49oJc8fOi9VfWBnimGEpB/dK//3YPp7TdMkQgcS4LJpepUULrYlUA== X-Received: by 10.98.59.139 with SMTP id w11mr10181056pfj.188.1512128051938; Fri, 01 Dec 2017 03:34:11 -0800 (PST) Date: Fri, 1 Dec 2017 20:34:05 +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: <20171201113405.GA5205@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [kernel-hardening][PATCH v2 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 --- 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;