From patchwork Mon Feb 27 20:43:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9594195 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 5721960471 for ; Mon, 27 Feb 2017 20:44:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4987827F9F for ; Mon, 27 Feb 2017 20:44:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E3002832D; Mon, 27 Feb 2017 20:44:30 +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 5A9C527F9F for ; Mon, 27 Feb 2017 20:44:29 +0000 (UTC) Received: (qmail 7954 invoked by uid 550); 27 Feb 2017 20:43:58 -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 6133 invoked from network); 27 Feb 2017 20:43:46 -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=VQ705DQjB2qk7yrU2bdL/VY/tJLKZqd/d/mNyoZhctg=; b=fTIs/4ju39bmpC6EN9YHtn2sRuO2j0jH1GyxxwONDfrSfnEVB+hXxzVQ9EE70T2Zxo 9sUCcHx3MmYAjyPTpOtRkc39qCSPt+ZzgdADblILXUfqBnexm0Y+mkn2uSJ/6rxqD4CA 7wqKGCZUTJFf0VhLOO6pcj7N7WTFLZrYYXzFc= 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=VQ705DQjB2qk7yrU2bdL/VY/tJLKZqd/d/mNyoZhctg=; b=RDXS7/64oqViUKdCynFR9fIOcD7hWoAlFhVs1RK1XcAevSuS00aA3P9UrrTCYv6ubY p8UIWupP7RTV806krNsiw+pHHDGHkImAjc7AGW85F514XuAnmyDwLBuKCWRLuVHe9LPR kFEMuXjRk/3lZe9B/NeBxrNiyyU/EKV1lqMar7Fripvt+WoZ9cl1E3KXzNOdEWjHJ2vm p6pevZGwl8krJWRqfcBDaNfUIBY3XDolHGYXdgDrzW7dDixJv43trfXxBmkH/EbMaKo0 3tx5LSubZ3EVPbkE0/E9bi32T1A8H0Zon0B2Ve33QScQslxkb8s60XThLKLouEsyMx65 4Vww== X-Gm-Message-State: AMke39l4zyaX4Dis5jjNh7Ga3R4ma3axrfMAwV1x63kp9fshohRLa4h5CEMK7D5Gsyei2x62 X-Received: by 10.99.164.18 with SMTP id c18mr23247713pgf.40.1488228214253; Mon, 27 Feb 2017 12:43:34 -0800 (PST) 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 Date: Mon, 27 Feb 2017 12:43:06 -0800 Message-Id: <1488228186-110679-9-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488228186-110679-1-git-send-email-keescook@chromium.org> References: <1488228186-110679-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [RFC][PATCH 8/8] 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 enable/disable pairs to perform the needed updates. Signed-off-by: Kees Cook --- include/linux/cgroup-defs.h | 2 +- kernel/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 861b4677fc5b..aa15b3132bce 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -431,7 +431,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.c b/kernel/cgroup.c index b794bcadefa4..19a8e1baeb6b 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3653,11 +3653,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); @@ -3760,11 +3760,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_enable(); + __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_disable(); } } @@ -3795,8 +3800,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_enable(); + __rare_write(cft->kf_ops, kf_ops); + __rare_write(cft->ss, ss); + rare_write_disable(); } return 0; @@ -3809,7 +3816,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; @@ -3866,7 +3873,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); @@ -3887,8 +3894,10 @@ int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) { struct cftype *cft; + rare_write_enable(); 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_disable(); return cgroup_add_cftypes(ss, cfts); } @@ -3904,8 +3913,10 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) { struct cftype *cft; + rare_write_enable(); 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_disable(); return cgroup_add_cftypes(ss, cfts); }