From patchwork Tue Oct 2 00:55:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10622959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FA51174A for ; Tue, 2 Oct 2018 01:04:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 676A1286D1 for ; Tue, 2 Oct 2018 01:04:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C487286D6; Tue, 2 Oct 2018 01:04: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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE032286D1 for ; Tue, 2 Oct 2018 01:04:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727113AbeJBHpI (ORCPT ); Tue, 2 Oct 2018 03:45:08 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:36691 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbeJBHpH (ORCPT ); Tue, 2 Oct 2018 03:45:07 -0400 Received: by mail-io1-f67.google.com with SMTP id p4-v6so295491iom.3 for ; Mon, 01 Oct 2018 18:04:36 -0700 (PDT) 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=2PrWkBQw+7KkRjKU4t11PQdbbEVewWsM4UkLQzJpM9s=; b=djJNATBLK5z3FwGJIzUXfO8/Y8qnE+FM0+JLbKssnzbHrYKr7+A7aUTRjC5+WJyO/o 46QlkC9qA/1C/Z6Hl5gAetM6A6/U+mI3ekPs9G+sbFqsvQFubUbhaIpKJEO1kDmqaub1 sO2ESHy4N82d3uanV3/rwTJca9ADxT52XtbtQ= 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=2PrWkBQw+7KkRjKU4t11PQdbbEVewWsM4UkLQzJpM9s=; b=uSGARf4YQTTKJJbf5Rhg8pKU9gH0mI8NBAYtzyGZN33Py8Ou/Ktm5Ukacx5W9iVrmt 6ySRY+PgNDeGDTw1u9WWHGRmp0Llk722FIjm+nV+RHj+KYc9RobwwELQpovLEgOb01Yx EgSbaGUzoyfaa7hY6HdmP/QasLlDcDqwQOFCvY1z1+MQGuA+fGKSNJGu/Wq9Ng+O8L5O YsJ1IR9sXu8DWR8ahzRXh97RX8WME5SOXPrdedyKINqSW6/G9RBPTxkfxwSFZfs4In3h N4UssrVTW/ynLjuVf+EIKYDOVfhRmO1KptRGZAGR2N2z4qZ6fA+dXiQCEyqWCMpYfLJE HeMA== X-Gm-Message-State: ABuFfoge3p4lp8SY3ZGAItt12tzI/JgLbpUcIRimGQVYe+DqdN7uvxip z0XejJDIEWUPT+6vIPl5rPVhBw== X-Google-Smtp-Source: ACcGV63bDwZzJJS3BKhoNCrEgeBXlTv77oyYZaw1nKc7t/drdZeqwt9FHKZQsuk8tDWLhjHZFLMN2Q== X-Received: by 2002:a62:c957:: with SMTP id k84-v6mr14049139pfg.205.1538442275676; Mon, 01 Oct 2018 18:04:35 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id h5-v6sm12219070pfo.135.2018.10.01.18.04.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Oct 2018 18:04:29 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v4 28/32] Yama: Initialize as ordered LSM Date: Mon, 1 Oct 2018 17:55:01 -0700 Message-Id: <20181002005505.6112-29-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181002005505.6112-1-keescook@chromium.org> References: <20181002005505.6112-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This converts Yama from being a direct "minor" LSM into an ordered LSM. Signed-off-by: Kees Cook Reviewed-by: Casey Schaufler --- include/linux/lsm_hooks.h | 5 ----- security/Kconfig | 2 +- security/security.c | 1 - security/yama/yama_lsm.c | 8 +++++++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 098ccf2caa0e..63a6caaee8e6 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2086,10 +2086,5 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */ extern void __init capability_add_hooks(void); -#ifdef CONFIG_SECURITY_YAMA -extern void __init yama_add_hooks(void); -#else -static inline void __init yama_add_hooks(void) { } -#endif #endif /* ! __LINUX_LSM_HOOKS_H */ diff --git a/security/Kconfig b/security/Kconfig index e59cb9296316..c459d2b4c7bd 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -293,7 +293,7 @@ config LSM_ENABLE config LSM_ORDER string "Default initialization order of builtin LSMs" - default "loadpin,integrity" + default "yama,loadpin,integrity" help A comma-separated list of LSMs, in initialization order. Any LSMs left off this list will be link-order initialized diff --git a/security/security.c b/security/security.c index 6957f5f50483..44c23d23158e 100644 --- a/security/security.c +++ b/security/security.c @@ -296,7 +296,6 @@ int __init security_init(void) * Load minor LSMs, with the capability module always first. */ capability_add_hooks(); - yama_add_hooks(); /* Load LSMs in specified order. */ prepare_lsm_order(); diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index ffda91a4a1aa..eb1da1303d2e 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -477,9 +477,15 @@ static void __init yama_init_sysctl(void) static inline void yama_init_sysctl(void) { } #endif /* CONFIG_SYSCTL */ -void __init yama_add_hooks(void) +static int __init yama_init(void) { pr_info("Yama: becoming mindful.\n"); security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks), "yama"); yama_init_sysctl(); + return 0; } + +DEFINE_LSM(yama) = { + .name = "yama", + .init = yama_init, +};