From patchwork Wed Dec 6 10:25:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinbum Park X-Patchwork-Id: 10095445 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 0CE4B60327 for ; Wed, 6 Dec 2017 10:47:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F141229C8E for ; Wed, 6 Dec 2017 10:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5EEF29CA9; Wed, 6 Dec 2017 10:47:37 +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 76DB729C8E for ; Wed, 6 Dec 2017 10:47:37 +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=bPF+/FRdO82/sl9qceH8HYKWYuaVJt01QtEwm6AfSoo=; b=j2tOjpZEV9Ak8C GAdx/eEdmQ7UEIXYMSygSKw2U4WfSyUid3xMdOqb9QAtmK9ahqBzOqpitpjaJ5U4l+mbhIvpoRqtS t9zfsZLl0L08kr0CMEJ82cuX5zNfeLHO6LZE8haic4QNk2vvXM5SPE/0rb4wXgLdX+9B4FvLHjoql FK0xQpqopejeFZXJs4POB6x2t4cW880aYC1BpM8MW0/XuToBeWCCN+ZagOjKVj3MJR5P1v//xISuh cIxnNZx4fuF5apS/lF18zkqGGlgDBnWr7XVcSNJ8xZqFFvBL8ENYRvEwzP8Ev1+5/7N2SBxirsTq0 0FAmqkbqwSVMC3AArGsw==; 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 1eMXEm-00027J-NH; Wed, 06 Dec 2017 10:47:36 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMXDj-0000xu-NM for linux-arm-kernel@bombadil.infradead.org; Wed, 06 Dec 2017 10:46:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CkU/RHnHmFHurJZEquabzhubpizOZCIZQ4O0nnu2db4=; b=Iq1PW/l5O85QBMacotBACdz1eO CD0neCmuKVjyJqmEq2Q+YftyhDwF5GhUKk+AvX9+NHJ3LKlsZZead3tzKpDPo51YAq7bnEy8nXuc+ fh1fbCqIiSK2zgy91Ly1cp2wo0O4GjsApmTDpFuO6kz3khsecAbnqSBmvhwkqWX2TmvBWdy/YnreH eEms8FK5bB2lQYV0l03ULJcU7L9mJfWN0mqo8ABW2BU0TRLUNua9vzeHIQ/1LxbL1mR6tObm/SyW3 sfdCW27Y4WmAyMtVezglT0u7f2WQO9gkh1sAP9aN5nCqjIgrblCYVAoVroFEyr/41FYREmXrp4c/A uRWdLKMw==; Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMWtq-0007OM-2r for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2017 10:25:58 +0000 Received: by mail-pl0-x242.google.com with SMTP id v41so644632plg.4 for ; Wed, 06 Dec 2017 02:25:35 -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=CkU/RHnHmFHurJZEquabzhubpizOZCIZQ4O0nnu2db4=; b=VqPnpK1V914I59BccGZREtLmLV6Dqh2qRo4LaphlEuHxZyNE5uDPiTBhX6Jl7xJ5UL 2MOT89JzvyN45dLqZK4U9RodhgWzX5y0C5jlabS+58eS858VGEPdGhES6Xj2o7V1aI/t qrcNk5hfMNbQ3YQJNlfyKer0lqHQ/vYga0L95y0LiJ7D+zscVcRrOjh8oEvdF5iTRpBb HC92sC73wJoo09628eHSId7tU6rA+NbRWgPEiOWnGKet2aS5UlGjCwnicEMbSf8eYr71 jHdGYGImigREs9ajKuqB7jDmupSI87h6eU3NjEt4kTAOEaayABtvnX/7sUi9xe6F8TDp p0zA== 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=CkU/RHnHmFHurJZEquabzhubpizOZCIZQ4O0nnu2db4=; b=p1+VPvRh0XpRd3q1z7L3wAu1dTKAEwPoWd1X1NeCua1NDKpZSqYdy6Rdk9EiS+YnN4 OA0fWMMNmJWUXrPA08riFqyyo5WGafwO26xdy6SMMVTo0FQrZZDUVIHjX3O94C8zP69C HsBvRyou0WniS2zlq/1kWFoNcVSrXJgKyUVXov2FONgwnOWHww9O+2a1WB2pukx2infq DLodJbbQMs0ylnG9saMazbyG4pOPkNqE4+jssYDCQdu9UepyeQwJ/1MAQWOmdlOoEZ/O h51cUZJ17ChPfY0bgX2Ek8EQ0dIaEsgxx8IoyH0mliVBm/kl+VcCKQp9IGlKyRhkEWeI EuSw== X-Gm-Message-State: AJaThX4Y0YHIOP3HYpoZ82n+5eQyFcj8PF7R7ekYRsCrY55LAA2/TJwL pLlEn/+3VerJDyMaCfQXt7ba4A== X-Google-Smtp-Source: AGs4zMYzellZQMQ78btRd8oiNwBZNE4jibjL11t836Ss0Gx3FBvbtbWfxrTf0y9qguNy6b199ya0/A== X-Received: by 10.84.238.141 with SMTP id v13mr21498117plk.37.1512555932960; Wed, 06 Dec 2017 02:25:32 -0800 (PST) Received: from pjb1027-Latitude-E5410 ([58.227.15.43]) by smtp.gmail.com with ESMTPSA id m124sm4400222pfc.64.2017.12.06.02.25.29 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 06 Dec 2017 02:25:32 -0800 (PST) Date: Wed, 6 Dec 2017 19:25:25 +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 v4 2/3] arm: mm: dump: make the page table dumping seq_file optional Message-ID: <20171206102525.GA7054@pjb1027-Latitude-E5410> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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")) Acked-by: Kees Cook Signed-off-by: Jinbum Park --- v4: Add Acked-by from Kees Cook --- 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;