From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EFCA28312E for ; Thu, 14 Aug 2025 22:54:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755212087; cv=none; b=O0C+FWiN+dvzjmWZU5T0jXWUB1r8su0gNTXABjUb50bregX5iq3HCI+Rym5zkAcsz6IXNz5bBIr6FdCA5DC2kzXhQsdvH6S+9t/XkV9F3AGeQABczNhqt2U9mH0455DA9foPlvc5+9cZwtqm7IAl9/ZXyG1Znw5INunKMz9L/wE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755212087; c=relaxed/simple; bh=wad8yPxEqZJqWB5zjU/z7iNb/lxx1a9hnkJhlJgcoa0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBic9hFjwiW+PY1RbzNnNePs1S8TkgrZHU6m0yweAaUVTwkHVupuyVQY8O640ujkNAycabQdeaOUKsXGtuvcc0/Y9NXoEpGTqYZKnGog5vg1sPUFYxhfRlXuhsx8yAA9GjJlDtCNyxB0mg8LD+vLdsHN5NN9nYadgPNAfcPHEwU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com; spf=pass smtp.mailfrom=paul-moore.com; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b=Ooj46su4; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b="Ooj46su4" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7e8704c7a46so162187185a.1 for ; Thu, 14 Aug 2025 15:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1755212084; x=1755816884; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=55Egp+RXQZtA9dvYXyUja+ZKqUHQpjzNbm1GmwcO400=; b=Ooj46su4uIA4DL0+8rURkrQ726A1apiY4/LO0duyOxy9Wa1eU+LVUgNg4dee/p1dFw j0ooR0vfuCDKw5PskHSDiPV55iZMQ0GUyhCRvRzZBMvOXFBVEeF80g1bUpzBy1BJRVYd IJrzhpwWLvJW+IQ1OLIucf3mevtlC3fa1DY7RqD7m6b/zZiZIidCAslfWMozwMw2urEt 9JMWOhblCT8lZ52sKonhUwfxNDp0PIZCOkliSAk1i8S4z0vwaqyXcEpgJ0d6ushov6eH pVB+TwB27FwXNBYwkiQRsJCKHJC32jR255e5J4WSeq5wgkb9Cdb9l/gqYUFam5uq41gN FzVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755212084; x=1755816884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=55Egp+RXQZtA9dvYXyUja+ZKqUHQpjzNbm1GmwcO400=; b=QOJ6H1Gid2LWDNgSEiFT+gbP4+jMT+9ikXV5KB5bW4DKFIBcpfTfCjpebQt7Sa5kvj Vgz0wu4nkxq8FH2YgOaqguFbN1OOowV5cDIXLFzDQZZt8Le9O+HYpaa4sdfoTHXxXW9S TQZ9y4JX0FuJYxe+xEvHBmABMbzsokbHNTBFTuhiGDQFijdylvhm5KbwmF3TX/NkD8A4 3rMd4u4DAnx+lu4wTeUtlz8pZQJnrHVsbHxBf/BcolwDwj6Gkv4CFbEt855oL0oVpsrz fjZmJ36qvlUtNpwpxFww7UvY8h9trcKoz9h9Rlr4dKLTOTn4NXFO8NCMibZfZRnaqEng ym1w== X-Gm-Message-State: AOJu0Yzpa8G1O24DBQ/bgDBpbVpAlb1aFjjj+oqfrPuQHmMJOq1Lx1db Nmc/AMgh/oLoD7yzcv6gcyfB1StGYRhHkM4bYHEYUDX4ycpL3Vy/AOpbEEIymDEJGmzXquK30VJ d5aU= X-Gm-Gg: ASbGnctXT/7K9nRCJehEoxexSSgEs0eL49YTyFDQiom8Sh4qdpBWxdb/sYkTdzWHtkl I6xkH1OG3Ip0r0kz56tcbjIPbQKS3arQMRGwHv5SUtRYMbWQeriINJvfKuwMZ19H0T6XqvTc9F2 3lKfOaJmX2YNIsFRJuTye/ck3cdE/yR/x22FKQTwJSKCSDNVYBZLHJ8xASVcWNTwx84uxifSK6G SQjyw+8sik7dhgeUH1pgRHigpUjQLyBSriVOsUocfuB8UbrLGSelyddKlx+5Y1whQ5ibqScOWb0 rhQsOWZodqg4dCqLmUGJV5p7vnH3vihtD24dP9Qif7eQFs4UhglErekzqXttVakGzeJ6YmUqplU v/LcXUEWHgD6/U3Od10BDsPqCxT84/7PxvqSgecjuxH/9hNPVzl21N2EJKtnGVqFfBqE= X-Google-Smtp-Source: AGHT+IFATlyDVZgQwGsskaUrsMGLhGawwCV5ho2uB3y1kIW5aDNySggh6hjXcnb1lF+Jz+1ewBInLA== X-Received: by 2002:a05:620a:3908:b0:7e8:26e0:d3de with SMTP id af79cd13be357-7e871b5aefdmr504549885a.43.1755212084141; Thu, 14 Aug 2025 15:54:44 -0700 (PDT) Received: from localhost (pool-71-126-255-178.bstnma.fios.verizon.net. [71.126.255.178]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-7e87b32ef87sm44177485a.7.2025.08.14.15.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 15:54:42 -0700 (PDT) From: Paul Moore To: linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org Cc: John Johansen , Mimi Zohar , Roberto Sassu , Fan Wu , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , =?UTF-8?q?G=C3=BCnther=20Noack?= , Kees Cook , Micah Morton , Casey Schaufler , Tetsuo Handa , Nicolas Bouchinet , Xiu Jianfeng Subject: [PATCH v3 22/34] lsm: group lsm_order_parse() with the other lsm_order_*() functions Date: Thu, 14 Aug 2025 18:50:31 -0400 Message-ID: <20250814225159.275901-58-paul@paul-moore.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250814225159.275901-36-paul@paul-moore.com> References: <20250814225159.275901-36-paul@paul-moore.com> Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4854; i=paul@paul-moore.com; h=from:subject; bh=wad8yPxEqZJqWB5zjU/z7iNb/lxx1a9hnkJhlJgcoa0=; b=owEBbQKS/ZANAwAKAeog8tqXN4lzAcsmYgBonmjUH2R8ndI0hwu0qT0k72q8mJi/ie5cwv4ZL 6/AsZ+tpA2JAjMEAAEKAB0WIQRLQqjPB/KZ1VSXfu/qIPLalzeJcwUCaJ5o1AAKCRDqIPLalzeJ c/oID/9tHFTtM1bbmzEE7keI3+CsbS1vT013C8vbxytLOtitFf+ZLnKCPFW3Jkiqmv0X2gL0Idc KFDJwlGfY6lG/duXdFtyex8hki3sgH5hg1L4GgBmz72pH8Bndb9snkTqKOqeSlSUp/fWMeD5Pax 9WS71+9yC0Zyllj6D1Hg6eoCUm4AvPx/bXurQKGFVefCGXdUMwZ1AYPSNfOa87tPb6q6S5fQF3I o0q+O3Ta49Fqxh1gawlUPLU7wxRyfMtzymmcs2t777AHmpzva5pp9DAvpI+3Fm8YoTBU1TEyscM dsOADO5IRIeD9tZVbWkUYvboulObWFt4jKqj1HZUewNfEMjzrxCA5/yttkxu4B3bO2WMLsTcSoY dV0PfQ3xs+YWo0YJJjrPtGtg4dvhQO0+qNhsag1/NDeUI3YOKICv8Ud2RljEFVjmvyr2yUqH0Lt I6pndDOVCoiRgohQfK34b7FxEJPZyqSWmyn4d9JwCiVSngKGmHp5EFYnPyefiN5Euet8cmqTxwO KNXCmvCEsPr8hLWbrFqJGJGtLTedJFMHZ90X3FoJW3uhdPDIqFXGEKkSGEMmPGuTQA79/mluwkO 3uFEkfqvDcLbINHZgNuxMyayFE9GE5qggBsSne0awsHR9k8IU3RkqL5cJcSfWU6oaxrN+r14r13 dTxMTgBbtWGflHA== X-Developer-Key: i=paul@paul-moore.com; a=openpgp; fpr=7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A Content-Transfer-Encoding: 8bit Move the lsm_order_parse() function near the other lsm_order_*() functions to improve readability. No code changes. Reviewed-by: Casey Schaufler Signed-off-by: Paul Moore --- security/lsm_init.c | 140 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/security/lsm_init.c b/security/lsm_init.c index c6aea57a01e6..363aac92a8da 100644 --- a/security/lsm_init.c +++ b/security/lsm_init.c @@ -169,6 +169,76 @@ static void __init lsm_order_append(struct lsm_info *lsm, const char *src) lsm_pr_dbg("enabling LSM %s:%s\n", src, lsm->id->name); } +/** + * lsm_order_parse - Parse the comma delimited LSM list + * @list: LSM list + * @src: source of the list + */ +static void __init lsm_order_parse(const char *list, const char *src) +{ + struct lsm_info *lsm; + char *sep, *name, *next; + + /* Handle any Legacy LSM exclusions if one was specified. */ + if (lsm_order_legacy) { + /* + * To match the original "security=" behavior, this explicitly + * does NOT fallback to another Legacy Major if the selected + * one was separately disabled: disable all non-matching + * Legacy Major LSMs. + */ + lsm_for_each_raw(lsm) { + if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) && + strcmp(lsm->id->name, lsm_order_legacy)) { + lsm_enabled_set(lsm, false); + lsm_pr_dbg("skip legacy LSM conflict %s:%s\n", + src, lsm->id->name); + } + } + } + + /* LSM_ORDER_FIRST */ + lsm_for_each_raw(lsm) { + if (lsm->order == LSM_ORDER_FIRST) + lsm_order_append(lsm, "first"); + } + + /* Normal or "mutable" LSMs */ + sep = kstrdup(list, GFP_KERNEL); + next = sep; + /* Walk the list, looking for matching LSMs. */ + while ((name = strsep(&next, ",")) != NULL) { + lsm_for_each_raw(lsm) { + if (!strcmp(lsm->id->name, name) && + lsm->order == LSM_ORDER_MUTABLE) + lsm_order_append(lsm, src); + } + } + kfree(sep); + + /* Legacy LSM if specified. */ + if (lsm_order_legacy) { + lsm_for_each_raw(lsm) { + if (!strcmp(lsm->id->name, lsm_order_legacy)) + lsm_order_append(lsm, src); + } + } + + /* LSM_ORDER_LAST */ + lsm_for_each_raw(lsm) { + if (lsm->order == LSM_ORDER_LAST) + lsm_order_append(lsm, "last"); + } + + /* Disable all LSMs not previously enabled. */ + lsm_for_each_raw(lsm) { + if (lsm_order_exists(lsm)) + continue; + lsm_enabled_set(lsm, false); + lsm_pr_dbg("skip disabled LSM %s:%s\n", src, lsm->id->name); + } +} + /** * lsm_blob_size_update - Update the LSM blob size and offset information * @sz_req: the requested additional blob size @@ -241,76 +311,6 @@ static void __init lsm_init_single(struct lsm_info *lsm) WARN(ret, "%s failed to initialize: %d\n", lsm->id->name, ret); } -/** - * lsm_order_parse - Parse the comma delimited LSM list - * @list: LSM list - * @src: source of the list - */ -static void __init lsm_order_parse(const char *list, const char *src) -{ - struct lsm_info *lsm; - char *sep, *name, *next; - - /* Handle any Legacy LSM exclusions if one was specified. */ - if (lsm_order_legacy) { - /* - * To match the original "security=" behavior, this explicitly - * does NOT fallback to another Legacy Major if the selected - * one was separately disabled: disable all non-matching - * Legacy Major LSMs. - */ - lsm_for_each_raw(lsm) { - if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) && - strcmp(lsm->id->name, lsm_order_legacy)) { - lsm_enabled_set(lsm, false); - lsm_pr_dbg("skip legacy LSM conflict %s:%s\n", - src, lsm->id->name); - } - } - } - - /* LSM_ORDER_FIRST */ - lsm_for_each_raw(lsm) { - if (lsm->order == LSM_ORDER_FIRST) - lsm_order_append(lsm, "first"); - } - - /* Normal or "mutable" LSMs */ - sep = kstrdup(list, GFP_KERNEL); - next = sep; - /* Walk the list, looking for matching LSMs. */ - while ((name = strsep(&next, ",")) != NULL) { - lsm_for_each_raw(lsm) { - if (!strcmp(lsm->id->name, name) && - lsm->order == LSM_ORDER_MUTABLE) - lsm_order_append(lsm, src); - } - } - kfree(sep); - - /* Legacy LSM if specified. */ - if (lsm_order_legacy) { - lsm_for_each_raw(lsm) { - if (!strcmp(lsm->id->name, lsm_order_legacy)) - lsm_order_append(lsm, src); - } - } - - /* LSM_ORDER_LAST */ - lsm_for_each_raw(lsm) { - if (lsm->order == LSM_ORDER_LAST) - lsm_order_append(lsm, "last"); - } - - /* Disable all LSMs not previously enabled. */ - lsm_for_each_raw(lsm) { - if (lsm_order_exists(lsm)) - continue; - lsm_enabled_set(lsm, false); - lsm_pr_dbg("skip disabled LSM %s:%s\n", src, lsm->id->name); - } -} - /** * lsm_static_call_init - Initialize a LSM's static calls * @hl: LSM hook list -- 2.50.1