From patchwork Fri Dec 1 10:42:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10087083 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 0FEC66037E for ; Fri, 1 Dec 2017 13:38:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E192B2A4E9 for ; Fri, 1 Dec 2017 13:38:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5D862A528; Fri, 1 Dec 2017 13:38: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 0BA6C2A4E9 for ; Fri, 1 Dec 2017 13:38:20 +0000 (UTC) Received: (qmail 32506 invoked by uid 550); 1 Dec 2017 13:36:22 -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 13377 invoked from network); 1 Dec 2017 10:43:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=J8l+e+dWDPBEn/lu9qVCMZm6cD1jSkbYYx5/m1bKMnZNRAovWzi7HWFFOifmbOREv3 t0BNnNKjgEfZap9wRU+mxapjNP7gY+For38ilWF0/GZeqWYa7Ffv+eWKHNrUOPBGczqp Xig/FKsGrV9gNLY8wGPooQFMSQU/1f4ZbT48OaOvndpyDqDUoy4Zf5RABDEbIC1BQmuj naKKD56VCsRAnPtl+0oxcL5VMERKFFL/Nms2eBRu5YEZS+lYMaD5OTBx0CDdDMFfH3Eg 6OXSGeWwiAhCRVZc5zVVsPnngC2Z+ETuFPKCecMJiLiKYu0S2C0oaar20U6UCHJR7w4o 7Nfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=nRFnN3jjHIgvOdNhAauKhyBpu4QrywoKMqKg8YVcUHw=; b=jlQoqy2r64lEsDS2CAJ/xWeNb/5nvYE3DIVvT6vgGQzK5Z448dusCAtJbkvtNM37/H IvTN8D+Oq8Qn5QOHio1gkHPpiGOD2mayGyRQyInL2IPxIDzaBzFX9/lkpLPn8on2ZEVK NgiWWQMeCzFWKkW7kaw9K0mIEdQ2lNqVs5+zh4CfU9xkMOcYVF3Dew0KKsNLgEooZZHc f7nAsdFIIS1i1fvjdZGy0SHcJW3fMPLJIYSYSHMvLrZrtRadZYbyuz9gxh/UBMx3e1QN L5mFTnG5ciha/g3CqRtyir5KVSqC0SP1GV9m4HnyEXs76hl+q3X0HKx2h24ZYcLuXXei G8aA== X-Gm-Message-State: AJaThX6PjtdUKuyKOiyeNqtKuvVJuqVOfUuHlI2LQFLNjBU/K8WWUWAT R9/Uhg+T26iiYlwJjQbysg4= X-Google-Smtp-Source: AGs4zMYpATqlBbE1j7rk43lYsYF4ocRh1nXjP5DkCVfxKM4Vt5G47IdfKHIuagC3OHZSM6zxkBlJWQ== X-Received: by 10.101.75.82 with SMTP id k18mr2279445pgt.234.1512124981348; Fri, 01 Dec 2017 02:43:01 -0800 (PST) From: "jinb.park" X-Google-Original-From: "jinb.park" Date: Fri, 1 Dec 2017 19:42:54 +0900 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: <20171201104254.GA3999@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [kernel-hardening][PATCH 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;