From patchwork Wed Mar 29 18:16:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9652211 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 3F9C6602C8 for ; Wed, 29 Mar 2017 18:17:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28DAB28510 for ; Wed, 29 Mar 2017 18:17:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1704A2851A; Wed, 29 Mar 2017 18:17:50 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 14D4728510 for ; Wed, 29 Mar 2017 18:17:48 +0000 (UTC) Received: (qmail 24210 invoked by uid 550); 29 Mar 2017 18:16:57 -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 21591 invoked from network); 29 Mar 2017 18:16:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qdj1PgfoQ6KIQ3ryIEYeJaWEudzrnKF504GPeo9Z4f0=; b=heB/X+8HS1MzzQVoLZT+0eYddrtC3dUCHCjB78Q6sgCjC74sfVb2FKm/EpW16h7NN9 5LUX7NV3zloMAWp8Q3xZS2s1VMb2gJBM5uha9A7uuQ410ZMBBjc60stcJKddO2onDLsi vz5rJ6S3rbS4GQzdO5W3Mnw7fHgmsTnOhvU6c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qdj1PgfoQ6KIQ3ryIEYeJaWEudzrnKF504GPeo9Z4f0=; b=LtYsapmaAJlTvwbQz1ggk/8kqjkdlqYSGG7jxw8RzHma5cNi2t46Gi1DgrUO6Q3CXT +Fgb5fAFJJiZqvoz/wgnlQnuV63hCxwTwxTkaHUAv08DQkF6kyNyg7qD86SUI8gMJDmx naGdT6ydGcJRQMtwaXYfp1896bctHShIevX6pkAlMCN7Wvz8pkXri86LpvPxOnFY+Lxz Bz+ogtBRkq0LwFq+58vlINUgOomh1IL/d1ZWLDF3mfxi6C3nlxgUjdNGMIP4poHpvb4q GlvRGVde4HIwDudekajkO2/5YAYXLxUQ3laI3j72p/zEBE/zSD9BAGe6Zdmtifl9LPlZ xk0w== X-Gm-Message-State: AFeK/H32GAhoUmGUijPX86tGwmkNNDbzpSKLeGMa5x8ef0zju64Gm7lW7CIqVwdxetaRwo4H X-Received: by 10.84.241.71 with SMTP id u7mr2126805plm.104.1490811386627; Wed, 29 Mar 2017 11:16:26 -0700 (PDT) From: Kees Cook To: kernel-hardening@lists.openwall.com Cc: Kees Cook , Mark Rutland , Andy Lutomirski , Hoeun Ryu , PaX Team , Emese Revfy , Russell King , x86@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Date: Wed, 29 Mar 2017 11:16:03 -0700 Message-Id: <1490811363-93944-12-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490811363-93944-1-git-send-email-keescook@chromium.org> References: <1490811363-93944-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [RFC v2][PATCH 11/11] cgroups: force all struct cftype const X-Virus-Scanned: ClamAV using ClamSMTP As found in PaX, mark struct cftype with __do_const and add helpers to deal with rare writes. This is a more complex example of a write-rarely structure, which needs to use list helpers and blocks of begin/end pairs to perform the needed updates. With this change and the constify plugin enabled, the before/after section byte sizes show: before: rodata: 0x2cc2f0 data: 0x130d00 after: rodata: 0x2cf2f0 (+74478) data: 0x12e5c0 (-65710) Signed-off-by: Kees Cook --- include/linux/cgroup-defs.h | 2 +- kernel/cgroup/cgroup.c | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 6a3f850cabab..67563a80d01f 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -434,7 +434,7 @@ struct cftype { #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key lockdep_key; #endif -}; +} __do_const; /* * Control Group subsystem type. diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 48851327a15e..94188df45f96 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -3058,11 +3058,11 @@ static int cgroup_add_file(struct cgroup_subsys_state *css, struct cgroup *cgrp, int ret; #ifdef CONFIG_DEBUG_LOCK_ALLOC - key = &cft->lockdep_key; + key = (struct lock_class_key *)&cft->lockdep_key; #endif kn = __kernfs_create_file(cgrp->kn, cgroup_file_name(cgrp, cft, name), - cgroup_file_mode(cft), 0, cft->kf_ops, cft, - NULL, key); + cgroup_file_mode(cft), 0, cft->kf_ops, + (void *)cft, NULL, key); if (IS_ERR(kn)) return PTR_ERR(kn); @@ -3165,11 +3165,16 @@ static void cgroup_exit_cftypes(struct cftype *cfts) /* free copy for custom atomic_write_len, see init_cftypes() */ if (cft->max_write_len && cft->max_write_len != PAGE_SIZE) kfree(cft->kf_ops); - cft->kf_ops = NULL; - cft->ss = NULL; + + rare_write_begin(); + __rare_write(cft->kf_ops, NULL); + __rare_write(cft->ss, NULL); /* revert flags set by cgroup core while adding @cfts */ - cft->flags &= ~(__CFTYPE_ONLY_ON_DFL | __CFTYPE_NOT_ON_DFL); + __rare_write(cft->flags, + cft->flags & ~(__CFTYPE_ONLY_ON_DFL | + __CFTYPE_NOT_ON_DFL)); + rare_write_end(); } } @@ -3200,8 +3205,10 @@ static int cgroup_init_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) kf_ops->atomic_write_len = cft->max_write_len; } - cft->kf_ops = kf_ops; - cft->ss = ss; + rare_write_begin(); + __rare_write(cft->kf_ops, kf_ops); + __rare_write(cft->ss, ss); + rare_write_end(); } return 0; @@ -3214,7 +3221,7 @@ static int cgroup_rm_cftypes_locked(struct cftype *cfts) if (!cfts || !cfts[0].ss) return -ENOENT; - list_del(&cfts->node); + rare_list_del(&cfts->node); cgroup_apply_cftypes(cfts, false); cgroup_exit_cftypes(cfts); return 0; @@ -3271,7 +3278,7 @@ static int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) mutex_lock(&cgroup_mutex); - list_add_tail(&cfts->node, &ss->cfts); + rare_list_add_tail(&cfts->node, &ss->cfts); ret = cgroup_apply_cftypes(cfts, true); if (ret) cgroup_rm_cftypes_locked(cfts); @@ -3292,8 +3299,10 @@ int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) { struct cftype *cft; + rare_write_begin(); for (cft = cfts; cft && cft->name[0] != '\0'; cft++) - cft->flags |= __CFTYPE_ONLY_ON_DFL; + __rare_write(cft->flags, cft->flags | __CFTYPE_ONLY_ON_DFL); + rare_write_end(); return cgroup_add_cftypes(ss, cfts); } @@ -3309,8 +3318,10 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) { struct cftype *cft; + rare_write_begin(); for (cft = cfts; cft && cft->name[0] != '\0'; cft++) - cft->flags |= __CFTYPE_NOT_ON_DFL; + __rare_write(cft->flags, cft->flags | __CFTYPE_NOT_ON_DFL); + rare_write_end(); return cgroup_add_cftypes(ss, cfts); }