linux-security-module.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Mickaël Salaün" <mic@digikod.net>
To: "Eric Paris" <eparis@redhat.com>,
	"Paul Moore" <paul@paul-moore.com>,
	"Günther Noack" <gnoack@google.com>,
	"Serge E . Hallyn" <serge@hallyn.com>
Cc: "Mickaël Salaün" <mic@digikod.net>,
	"Ben Scarlato" <akhna@google.com>,
	"Casey Schaufler" <casey@schaufler-ca.com>,
	"Charles Zaffery" <czaffery@roblox.com>,
	"Daniel Burgener" <dburgener@linux.microsoft.com>,
	"Francis Laniel" <flaniel@linux.microsoft.com>,
	"James Morris" <jmorris@namei.org>,
	"Jann Horn" <jannh@google.com>, "Jeff Xu" <jeffxu@google.com>,
	"Jorge Lucangeli Obes" <jorgelo@google.com>,
	"Kees Cook" <kees@kernel.org>,
	"Konstantin Meskhidze" <konstantin.meskhidze@huawei.com>,
	"Matt Bobrowski" <mattbobrowski@google.com>,
	"Mikhail Ivanov" <ivanov.mikhail1@huawei-partners.com>,
	"Phil Sutter" <phil@nwl.cc>,
	"Praveen K Paladugu" <prapal@linux.microsoft.com>,
	"Robert Salvet" <robert.salvet@roblox.com>,
	"Shervin Oloumi" <enlightened@google.com>,
	"Song Liu" <song@kernel.org>,
	"Tahera Fahimi" <fahimitahera@gmail.com>,
	"Tingmao Wang" <m@maowtm.org>, "Tyler Hicks" <code@tyhicks.com>,
	audit@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-security-module@vger.kernel.org
Subject: [PATCH v6 05/26] landlock: Prepare to use credential instead of domain for network
Date: Sat,  8 Mar 2025 19:44:01 +0100	[thread overview]
Message-ID: <20250308184422.2159360-6-mic@digikod.net> (raw)
In-Reply-To: <20250308184422.2159360-1-mic@digikod.net>

This cosmetic change that is needed for audit support, specifically to
be able to filter according to cross-execution boundaries.

Optimize current_check_access_socket() to only handle the access
request.

Remove explicit domain->num_layers check which is now part of the
landlock_get_applicable_subject() call.

Cc: Günther Noack <gnoack@google.com>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20250308184422.2159360-6-mic@digikod.net
---

Changes since v4:
- New patch.
---
 security/landlock/net.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/security/landlock/net.c b/security/landlock/net.c
index 104b6c01fe50..6fb3e60bc5ff 100644
--- a/security/landlock/net.c
+++ b/security/landlock/net.c
@@ -39,10 +39,6 @@ int landlock_append_net_rule(struct landlock_ruleset *const ruleset,
 	return err;
 }
 
-static const struct access_masks any_net = {
-	.net = ~0,
-};
-
 static int current_check_access_socket(struct socket *const sock,
 				       struct sockaddr *const address,
 				       const int addrlen,
@@ -54,14 +50,14 @@ static int current_check_access_socket(struct socket *const sock,
 	struct landlock_id id = {
 		.type = LANDLOCK_KEY_NET_PORT,
 	};
-	const struct landlock_ruleset *const dom =
-		landlock_get_applicable_domain(landlock_get_current_domain(),
-					       any_net);
+	const struct access_masks masks = {
+		.net = access_request,
+	};
+	const struct landlock_cred_security *const subject =
+		landlock_get_applicable_subject(current_cred(), masks, NULL);
 
-	if (!dom)
+	if (!subject)
 		return 0;
-	if (WARN_ON_ONCE(dom->num_layers < 1))
-		return -EACCES;
 
 	if (!sk_is_tcp(sock->sk))
 		return 0;
@@ -145,9 +141,10 @@ static int current_check_access_socket(struct socket *const sock,
 	id.key.data = (__force uintptr_t)port;
 	BUILD_BUG_ON(sizeof(port) > sizeof(id.key.data));
 
-	rule = landlock_find_rule(dom, id);
-	access_request = landlock_init_layer_masks(
-		dom, access_request, &layer_masks, LANDLOCK_KEY_NET_PORT);
+	rule = landlock_find_rule(subject->domain, id);
+	access_request = landlock_init_layer_masks(subject->domain,
+						   access_request, &layer_masks,
+						   LANDLOCK_KEY_NET_PORT);
 	if (landlock_unmask_layers(rule, access_request, &layer_masks,
 				   ARRAY_SIZE(layer_masks)))
 		return 0;
-- 
2.48.1


  parent reply	other threads:[~2025-03-08 18:50 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-08 18:43 [PATCH v6 00/26] Landlock audit support Mickaël Salaün
2025-03-08 18:43 ` [PATCH v6 01/26] lsm: Add audit_log_lsm_data() helper Mickaël Salaün
2025-03-08 18:43 ` [PATCH v6 02/26] landlock: Add unique ID generator Mickaël Salaün
2025-03-08 18:43 ` [PATCH v6 03/26] landlock: Move domain hierarchy management Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 04/26] landlock: Prepare to use credential instead of domain for filesystem Mickaël Salaün
2025-03-08 18:44 ` Mickaël Salaün [this message]
2025-03-08 18:44 ` [PATCH v6 06/26] landlock: Prepare to use credential instead of domain for scope Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 07/26] landlock: Prepare to use credential instead of domain for fowner Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 08/26] landlock: Identify domain execution crossing Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 09/26] landlock: Add AUDIT_LANDLOCK_ACCESS and log ptrace denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 10/26] landlock: Add AUDIT_LANDLOCK_DOMAIN and log domain status Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 11/26] landlock: Log mount-related denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 12/26] landlock: Log file-related denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 13/26] landlock: Log truncate and IOCTL denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 14/26] landlock: Log TCP bind and connect denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 15/26] landlock: Log scoped denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 16/26] landlock: Add LANDLOCK_RESTRICT_SELF_LOG_*_EXEC_* flags Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 17/26] landlock: Add LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 18/26] samples/landlock: Enable users to log sandbox denials Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 19/26] selftests/landlock: Add test for invalid ruleset file descriptor Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 20/26] selftests/landlock: Extend tests for landlock_restrict_self(2)'s flags Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 21/26] selftests/landlock: Add tests for audit flags and domain IDs Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 22/26] selftests/landlock: Test audit with restrict flags Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 23/26] selftests/landlock: Add audit tests for ptrace Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 24/26] selftests/landlock: Add audit tests for abstract unix socket scoping Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 25/26] selftests/landlock: Add audit tests for filesystem Mickaël Salaün
2025-03-08 18:44 ` [PATCH v6 26/26] landlock: Add audit documentation Mickaël Salaün
2025-03-09  9:41 ` [PATCH v6 00/26] Landlock audit support Mickaël Salaün

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250308184422.2159360-6-mic@digikod.net \
    --to=mic@digikod.net \
    --cc=akhna@google.com \
    --cc=audit@vger.kernel.org \
    --cc=casey@schaufler-ca.com \
    --cc=code@tyhicks.com \
    --cc=czaffery@roblox.com \
    --cc=dburgener@linux.microsoft.com \
    --cc=enlightened@google.com \
    --cc=eparis@redhat.com \
    --cc=fahimitahera@gmail.com \
    --cc=flaniel@linux.microsoft.com \
    --cc=gnoack@google.com \
    --cc=ivanov.mikhail1@huawei-partners.com \
    --cc=jannh@google.com \
    --cc=jeffxu@google.com \
    --cc=jmorris@namei.org \
    --cc=jorgelo@google.com \
    --cc=kees@kernel.org \
    --cc=konstantin.meskhidze@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=m@maowtm.org \
    --cc=mattbobrowski@google.com \
    --cc=paul@paul-moore.com \
    --cc=phil@nwl.cc \
    --cc=prapal@linux.microsoft.com \
    --cc=robert.salvet@roblox.com \
    --cc=serge@hallyn.com \
    --cc=song@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).