From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 09F2E7DE7C for ; Tue, 25 Sep 2018 00:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727453AbeIYGXc (ORCPT ); Tue, 25 Sep 2018 02:23:32 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40380 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726512AbeIYGXb (ORCPT ); Tue, 25 Sep 2018 02:23:31 -0400 Received: by mail-pg1-f196.google.com with SMTP id n31-v6so3230243pgm.7 for ; Mon, 24 Sep 2018 17:18:45 -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=c4wsyr1NZn56YkQKjbjGcHjAWvwN5RbGtjsBeVsLDNU=; b=bxlBTDbgLZnuGDjbn673OVHYRF9df9W7Kt9ZUSjmDGl8IBbhkXqXfhXZUPKX1IR9a9 wM58T7WMa4Zdl5QYmIQYFEaXzxK5RbTySNQ8ouMoeo+iVZuYzwu5hGQCvT/R77MXAzCp tNbtkA9iR5U7c48VWJ5CC67CtxMoohzURkOio= 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=c4wsyr1NZn56YkQKjbjGcHjAWvwN5RbGtjsBeVsLDNU=; b=KgyMM3MHQfZNoHSXfGvZAemwZEDsrAAsv2K0eYXiBnWvcASbfJ680FsvCPAB1kDGJD vdIrM8svETkyWZ3O3sZBwg5Kbl4ck4e6A5t7frru18UEmMEqOKfxxO0+umrZoJ4gvWZN EAZcaj9Gjp7owK/mhmuL9Bmj+15YvloYtBrd5IcbXV+o9k57ydTGiqOgFvie8yAW37JL vUNQUUk1JKNfqwj6G4v6iyq/gK8GTghlBlOqw4xMbZDU8JY28kHj+0AaVHS6I6BfVrEu isUztsR6PQSVNQn1+QV0G2dZQxMwW887HqEx7mxXIk5Ubfav4zqbhTJ2E98MHzcXP/1t 4RGw== X-Gm-Message-State: ABuFfohP1lpiGURUteWRuIg1M2MjUmUeDEdLqmwKcRA4Dw/KgAUd9yU1 C8zMwAr11MuE2oEKxakiBd+X1A== X-Google-Smtp-Source: ACcGV62ClFJfkD5dKmLg1O/5PQBsQ/21CN+/rBLxS+fFLVuAfwqKT3a3XEWOg1f9MkEy+JCioBzO/A== X-Received: by 2002:a63:1245:: with SMTP id 5-v6mr882047pgs.299.1537834725518; Mon, 24 Sep 2018 17:18:45 -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 o17-v6sm520730pgc.30.2018.09.24.17.18.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 17:18:42 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , James Morris , 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 v3 08/29] LSM: Record LSM name in struct lsm_info Date: Mon, 24 Sep 2018 17:18:11 -0700 Message-Id: <20180925001832.18322-9-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> References: <20180925001832.18322-1-keescook@chromium.org> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org In preparation for making LSM selections outside of the LSMs, include the name of LSMs in struct lsm_info. Cc: James Morris Signed-off-by: Kees Cook --- include/linux/lsm_hooks.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 02ec717189f9..543636f18152 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2040,16 +2040,20 @@ extern void security_add_hooks(struct security_hook_list *hooks, int count, char *lsm); struct lsm_info { + const char *name; /* Populated automatically. */ int (*init)(void); }; extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; #define DEFINE_LSM(lsm) \ + static const char __lsm_name_##lsm[] __initconst \ + __aligned(1) = #lsm; \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ __aligned(sizeof(unsigned long)) \ = { \ + .name = __lsm_name_##lsm, \ #define END_LSM } -- 2.17.1