From patchwork Thu Sep 20 16:23:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10608143 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 D3624161F for ; Thu, 20 Sep 2018 16:29:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36AA82DFD3 for ; Thu, 20 Sep 2018 16:29:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28CF62DFDB; Thu, 20 Sep 2018 16:29:48 +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 C62D92DFD3 for ; Thu, 20 Sep 2018 16:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387997AbeITWOB (ORCPT ); Thu, 20 Sep 2018 18:14:01 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36587 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387949AbeITWOA (ORCPT ); Thu, 20 Sep 2018 18:14:00 -0400 Received: by mail-pg1-f193.google.com with SMTP id d1-v6so4683472pgo.3 for ; Thu, 20 Sep 2018 09:29:43 -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=AcW3F/O+fl3XT2ZLqa+o+qWhOJ9ucCkwfwLeB76MZXo=; b=JeXHPMHHyCZQH9VNVaKgHvagSKYLdbtUuEpEDnIu9WRq5VXUF6pIMIe1YC2FAQfcTL H4AK2mucZZCXLHunN5rEIvVtDZk7RuEFq8nc1Gej5ylMVwlVuCjC7TnXaKo5EJnIyVgW VrYjM81q5d5lamF2qVadA9rR6IUB780UKq86M= 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=AcW3F/O+fl3XT2ZLqa+o+qWhOJ9ucCkwfwLeB76MZXo=; b=Bl0P7fh+7/Q1uoEHMN6kP7RW3AFL1Jqj7J2OezwN7fULVxjXGW5AVc9Q6wFlxcDdl5 Hsdsh6AXT3wWAGCgwFj4GbbsZ9oLXXxBeNsbAiT8zO7U6zVif8nBNd+AC2VHAel5Ibjl 9qAeVOBkFIZT5b8EZ0bqWOr0qNSWR4Bpo2DBmYXwufYS6jcjTQxQwtza0Z5wm0ZqJrj7 TnE/AEFxv63WS+RnescarpURVlAIYDFjF7/uSTItnOoWU7h4ZUQah34z4lGwu6/LtWhQ UnYHXcLfYqeOrs4OKHu/xVtjBo/imCY0yLHaralARvvEeS1xdri3lnhc/rf8EFsp4nX/ J4bA== X-Gm-Message-State: APzg51Cb23W+mvhzuHNfU+a/lDpL5WmuebxMJ0aBbTAcjuPbQql/Id17 n/3MHKH3DRsnUaJqthu+hzADcA== X-Google-Smtp-Source: ANB0VdZuFqaJsFSrEv52yNE+G9Q1sPwlwtBHGpcBceWc32tzAKdCVk5l6Zi07Zs3eHaZVH1ifS0aXg== X-Received: by 2002:a62:1157:: with SMTP id z84-v6mr42279294pfi.66.1537460982880; Thu, 20 Sep 2018 09:29:42 -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 s70-v6sm7430271pgc.16.2018.09.20.09.29.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Sep 2018 09:29:39 -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 v2 16/26] LSM: Prepare for reorganizing "security=" logic Date: Thu, 20 Sep 2018 09:23:28 -0700 Message-Id: <20180920162338.21060-17-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> References: <20180920162338.21060-1-keescook@chromium.org> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This moves the string handling for "security=" boot parameter into a stored pointer instead of a string duplicate. This will allow easier handling of the string when switching logic to use the coming enable/disable infrastructure. Signed-off-by: Kees Cook --- security/security.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/security/security.c b/security/security.c index 72d1ef2fc4cc..5cacbcefbc32 100644 --- a/security/security.c +++ b/security/security.c @@ -34,16 +34,12 @@ #define MAX_LSM_EVM_XATTR 2 -/* Maximum number of letters for an LSM name string */ -#define SECURITY_NAME_MAX 10 - struct security_hook_heads security_hook_heads __lsm_ro_after_init; static ATOMIC_NOTIFIER_HEAD(lsm_notifier_chain); char *lsm_names; /* Boot-time LSM user choice */ -static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] = - CONFIG_DEFAULT_SECURITY; +static __initdata const char *chosen_major_lsm; static bool debug __initdata; #define init_debug(...) \ @@ -90,7 +86,7 @@ static bool __init lsm_allowed(struct lsm_info *lsm) return true; /* Disabled if this LSM isn't the chosen one. */ - if (strcmp(lsm->name, chosen_lsm) != 0) + if (strcmp(lsm->name, chosen_major_lsm) != 0) return false; return true; @@ -154,6 +150,9 @@ int __init security_init(void) i++) INIT_HLIST_HEAD(&list[i]); + if (!chosen_major_lsm) + chosen_major_lsm = CONFIG_DEFAULT_SECURITY; + /* * Load minor LSMs, with the capability module always first. */ @@ -173,12 +172,12 @@ int __init security_init(void) } /* Save user chosen LSM */ -static int __init choose_lsm(char *str) +static int __init choose_major_lsm(char *str) { - strncpy(chosen_lsm, str, SECURITY_NAME_MAX); + chosen_major_lsm = str; return 1; } -__setup("security=", choose_lsm); +__setup("security=", choose_major_lsm); /* Enable LSM order debugging. */ static int __init enable_debug(char *str)