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: 10090511 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 898D860327 for ; Mon, 4 Dec 2017 14:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FF7828707 for ; Mon, 4 Dec 2017 14:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74BC0288B6; Mon, 4 Dec 2017 14:27:06 +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 0B0A228707 for ; Mon, 4 Dec 2017 14:27:05 +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=/yNVfT8FV5HMnokh/02nhWhpIevohGga7Otej8l6vq4=; b=s0nrXqSArvf1dB SpTsUkgLMTc/HxppLOL4a6PpfA1dHtWt1sQnadf+xUia+UGd5M1ac+wlUT3JZlm6A44hXZRaipxIY xaG5ZF4gKiKbq9pCF03PhJBEB277+rP5n1e+59ruJ1BPtPa4U3V0njbEB8RMxnOfWYitJU/5G04Eb F6oiAZnL6Xn6sDNnoVXv/imj9OQkjHxqoL1Hfzz2FVXtZhN5HajgcjbMZpE67gscJQ0+9/mZsPFzj s1GJWTBtuG/eGs6x0db4Skxo7Q3RtPLDZFed0DpOkgTHmhCX27UJoFF3UW6Z8Hxp0yfQ7Pc3ZfNu5 QD+rsKSi5do29SrRljHA==; 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 1eLri5-0000vZ-1n; Mon, 04 Dec 2017 14:27:05 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLri0-0000on-1Q for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2017 14:27:02 +0000 Received: by mail-pg0-x244.google.com with SMTP id j9so8294054pgc.11 for ; Mon, 04 Dec 2017 06:26:39 -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=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=eUurBUYYeyu9opwIVBk2/iJ3FzpS+SKddXXWc143TDi1QpjSWJKUzpN9oEnQKmGBiR PGzkVzmXrqoJ9NoW/jSofIBrROJ4cX0U6uLERaG8GR7fsfJ2znfdBKsDYGYnWJDdeuDi Nne484yQICCRpQEXCAHYrRzX5hVfFmBEKKBo+yfmWRF8fiXI9VM0l95eQzNA+SkLs+6M QWU3UNWEyIPfa9LHy3IKaOyE7XWOohEjq8tntbNa+WP3rz2dw/+PIO6gJ+2gRt2B+tq9 dktZV6Qscro2W6ASvj/p8TRw35Z+usNfqteKWwJMXDFY1w5movZkBTxFOpZmkRAofLmF 3IxA== X-Gm-Message-State: AJaThX6cVsniJwxHzqgpHnMzGemQ29gpan8e5N0hDgd0H6NnC7p9uPIZ gwKxuT5dPpxM7N6Si3Pg2xw6fg== 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) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id g77sm24531014pfd.75.2017.12.04.06.26.34 (version=TLS1_2 cipher=AES128-SHA bits=128/128); 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 Subject: [kernel-hardening][PATCH v3 2/3] arm: mm: dump: make the page table dumping seq_file optional Message-ID: <20171204142631.GA3359@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-20171204_062700_147974_9F3E21B2 X-CRM114-Status: GOOD ( 12.17 ) 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")) 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;