From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (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 8C6C5283128 for ; Thu, 14 Aug 2025 22:54:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755212054; cv=none; b=p/kv6J96Rw3ylLT5H2kHBcGTgLuYaj/HZQrNQ2FAl2kcURf1gr7N0DdZycqGLZbYh7SrNJdelFL9Kuh2Sk2ME4wQOss+d61qIIfZEQETNhrfhTQ1M9sLMQacO/FtAs+IQ5YJXYEECU8lQc69xB235YzSQUr23tMtsLY2Gqw/KoI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755212054; c=relaxed/simple; bh=6Jf2jSj9Zvd0Mvh69sW62nNqFI1LA47Wt+0bcTP+YXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FmqZIba+LQ7PmyZwp2KdvwdHae5Vejjd+JTUP6QKLXbmT3A9JleyCySdc/AiLhXDCd84h7GUOVW1rqE/C0e7ejZ9VveIm5d4himfOpuN2a7znjJ9O8Espho3m1ikwzkr65F18t9JS8KzeqZsPiCHTyNhR7sFDsFHaK+KIsO68GQ= 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=cpctCTDz; arc=none smtp.client-ip=209.85.222.174 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="cpctCTDz" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7e870621163so100319685a.2 for ; Thu, 14 Aug 2025 15:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1755212051; x=1755816851; 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=ZfdSqUjk/D+U4qDbwJ7jUGp3W+fkdYIRqKP/NHBw3bA=; b=cpctCTDz9amgPvGrJobpurIy/+7Q61LJL5wtmiqSGEDL5E+bxBLsj6H3w7p5j8Rdfz C5Ktoogm94AL6ZHaxpThaCtriDjZHeEFZ9sdYUd1UpOmKe6n17mF0OWvdYEOO6iE+UlI Sn6CLKgkkL0olgEIFX0UZDVwxrTXetHDXCRmOTzRV9T1B+81jS1Af54nDu0VK6RDeuQb NjbnxR/DepE5NOfWV9LLUymdhTZYkcDHVAav4E5udps1lNX54acA1YlYQG0Vg8Ihixg3 v/ybdASUw+iAM/KxO388OOQ9Ou8ML0W32Z1+IzFeNEj6zYKvViQvPL59dv6EZbyFgNTv ZI0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755212051; x=1755816851; 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=ZfdSqUjk/D+U4qDbwJ7jUGp3W+fkdYIRqKP/NHBw3bA=; b=Ww4jFuCONN6ckiQakwGl90JDUtYQH9+D/mVpYr9SPdaFyU1HAOcUzYo3Ql40dxJng8 iSTtNbdcBqieV14cQPZgxkH4LXfW3XvL+LYKR7ZbubJhRZ2v0fART/HSphXmt5hzBDwD fRaXlfPhE7/P6ULkOqkzTiYnRa5aqHKIF1dNM0cUyxVkb/SZoX/EbC7LXj+eBuYxEqO/ UaWtpPLnvdmTSgYsqQp9JyWX+DCpgpJ+iiAvrvDghT6i2/FhURooVLSX3lEUQ82yHsXm yOUIF4mwHB415E1mIaxldC6GM02qdyRScyp+SjMl3e3kb8MJXmOsY6onXEVTPjBhZUKu kdbQ== X-Gm-Message-State: AOJu0Yz6CuJZfG+NO1V1XpDDm68XARcag6e29ozEszBiJa67IHHx2Lt8 Kcr6OxY0iZnYHbY81EtMAJXi4HLqnzb9dAETnP9gpyngRl6oqJ822v8bucHPBaxtfLhPy6CuzF/ RUoI= X-Gm-Gg: ASbGncuAVMkXLy+rkwDEYKo21YCkID49gu8IuvuvP1cEdb1lFPMptVkCIU988M9B1RX RASutlMTc3UiVU2ya8N3qoPL4al2o4L06lzQ0rq5Rfn5u8iJKew09Y8//JXg/K180IJuEEhSR0Y eFW3HYWa7hmPzZcHMdHvg/ao+MAzKZKuIQywsYoQJdgmUa7WnZOIpUh/YDlCi0+hchThf/kTM6C 3UfDZNzfKyvhAJmFJfuDweHj5xuNq0wHfVupCO5DztDB+SeRwzTO7h56mss6Gy1C2cqUYQaW7/U j1gbNbs5kN3n2DTx0g/qjD4oortqprQs0HtBCA5tcxtb/dc2AfhjwJ8x5y2mOT3ae2qzLUcp0vz gmJ3L/NoM4/HFRs95SeMhcmeadXnVRNO0BcBoNTbW1k2iavtOO4knOUFhZpFiAtQ+a5g= X-Google-Smtp-Source: AGHT+IEQmZyx0M7TgORYr8o/XO/6xmULFCpLAKBfCrmCveoffJDDqUt+CH8ML3wbs8zziIrr6RjM+A== X-Received: by 2002:a05:620a:4588:b0:7e6:2610:f2e4 with SMTP id af79cd13be357-7e8702e34f6mr726583985a.3.1755212050739; Thu, 14 Aug 2025 15:54:10 -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 6a1803df08f44-70af5be3f2dsm19390316d6.75.2025.08.14.15.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 15:54:09 -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 05/34] lsm: integrate report_lsm_order() code into caller Date: Thu, 14 Aug 2025 18:50:14 -0400 Message-ID: <20250814225159.275901-41-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=2058; i=paul@paul-moore.com; h=from:subject; bh=6Jf2jSj9Zvd0Mvh69sW62nNqFI1LA47Wt+0bcTP+YXI=; b=owEBbQKS/ZANAwAKAeog8tqXN4lzAcsmYgBonmicHnek4WiqCOW6K4A7nX17F9Ywn83QPfVU4 FiS6nrsi1uJAjMEAAEKAB0WIQRLQqjPB/KZ1VSXfu/qIPLalzeJcwUCaJ5onAAKCRDqIPLalzeJ c9IaD/45j/lV0Ur2Yqe7ywMf6j05N+DIKvnf9HXUOCuTnrjvV0LPuKA/QpWDG1x79mFTaRtz0d8 5DFQXVIa0WyDQbILY8Ejp1mcYp7l9abcXC5a5Eb7/l9olzmm/9GbQIBjH5yxr09ULKG7fXZ6NLd lRXCuojqFKR/mFjofpsvx8ScE0UTrZ3Jnll9ug2a4dJ9WMTBXyNpDVRDXMBZacQoyjgmt/NlIBF GyKYtvZWYYZ33661Edq7L2f6T8ihsSf+N12pXzAw7HP9jfO3j3pFqN2TNa5PydZz9v0mfDz7KCE PDeJi7l9ZC+J8C4xrldXjHO/rvMCoroanMcj2TH92gu3McrssrSzVGKKDz3OObJ4SoJE0ZEDfsi 2KdFX8MpibR6Xcsq004F4aFmYzkzKpa74Rl2dQnFiIgOcwpBiNEZW0InPzpn7+EKDqrfTA0SFhx w9en76V6eUTHtGnGd8/6fewrFNQhGCOJ6+p6TDy1lyxVX6helIzMMzylcJTtQJRdC07B6yCDD2t ceNV/cpBHtvl1eL00gWOpMj8R/SaRCAGLaxeblEk2yMeOunLoPGyMvGS0Pbbb0fuLx8WvwRMnvN PUF5Ytp2rzq48nj9+QBFAzVS0cWHOSN+q2/iotcsxig+J4O7Rf8n+3DJYcJZHXf0geyCCWuvyv9 c7AiqV7M7KF6Q5A== X-Developer-Key: i=paul@paul-moore.com; a=openpgp; fpr=7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A Content-Transfer-Encoding: 8bit With only one caller of report_lsm_order(), insert the function's code directly into the caller and ger rid of report_lsm_order(). Reviewed-by: Casey Schaufler Signed-off-by: Paul Moore --- security/lsm_init.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/security/lsm_init.c b/security/lsm_init.c index 18828a65c364..09afa7ad719e 100644 --- a/security/lsm_init.c +++ b/security/lsm_init.c @@ -291,26 +291,6 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) kfree(sep); } -static void __init report_lsm_order(void) -{ - struct lsm_info **lsm, *early; - int first = 0; - - pr_info("initializing lsm="); - - /* Report each enabled LSM name, comma separated. */ - lsm_early_for_each_raw(early) { - if (is_enabled(early)) - pr_cont("%s%s", first++ == 0 ? "" : ",", early->name); - } - lsm_order_for_each(lsm) { - if (is_enabled(*lsm)) - pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name); - } - - pr_cont("\n"); -} - /** * lsm_early_cred - during initialization allocate a composite cred blob * @cred: the cred that needs a blob @@ -341,7 +321,9 @@ static void __init lsm_early_task(struct task_struct *task) static void __init ordered_lsm_init(void) { + unsigned int first = 0; struct lsm_info **lsm; + struct lsm_info *early; if (chosen_lsm_order) { if (chosen_major_lsm) { @@ -357,7 +339,16 @@ static void __init ordered_lsm_init(void) lsm_prepare(*lsm); } - report_lsm_order(); + pr_info("initializing lsm="); + lsm_early_for_each_raw(early) { + if (is_enabled(early)) + pr_cont("%s%s", first++ == 0 ? "" : ",", early->name); + } + lsm_order_for_each(lsm) { + if (is_enabled(*lsm)) + pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name); + } + pr_cont("\n"); init_debug("cred blob size = %d\n", blob_sizes.lbs_cred); init_debug("file blob size = %d\n", blob_sizes.lbs_file); -- 2.50.1