diff --git a/include/trace/events/landlock.h b/include/trace/events/landlock.h
index b6fdc6e2eef8..9b3e24a613d8 100644
--- a/include/trace/events/landlock.h
+++ b/include/trace/events/landlock.h
@@ -36,7 +36,8 @@ static_assert(sizeof(access_mask_t) <= sizeof(u64));
TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_FS_CHANGE_TOPOLOGY);
TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_FS_ACCESS);
TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_NET_ACCESS);
-TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_NAMESPACE);
+TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_NAMESPACE_CREATE);
+TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_NAMESPACE_ENTER);
TRACE_DEFINE_ENUM(LANDLOCK_REQUEST_CAPABILITY);
#ifdef CREATE_TRACE_POINTS
@@ -990,7 +991,8 @@ TRACE_EVENT(landlock_deny_access_net,
* @namespace_id: Namespace ID, not directly visible from user space when
* creation was denied.
*
- * Emitted when a Landlock domain denies namespace use.
+ * Emitted when a Landlock domain denies namespace creation or entry. The
+ * namespace_op field distinguishes these operations.
*/
TRACE_EVENT(landlock_deny_permission_namespace,
@@ -1021,13 +1023,18 @@ TRACE_EVENT(landlock_deny_permission_namespace,
__entry->namespace_id = namespace_id;
),
- TP_printk("domain=%llx same_exec=%d logged=%d blockers=%s namespace_type=0x%x namespace_id=%llu",
- __entry->domain_id, __entry->same_exec, __entry->logged,
- __entry->blockers_type == LANDLOCK_REQUEST_NAMESPACE ?
- __print_flags(__entry->blockers_access, "|",
- _LANDLOCK_PERMISSION_BLOCKER_NAMES) :
- "unknown",
- __entry->namespace_type, __entry->namespace_id)
+ TP_printk("domain=%llx same_exec=%d logged=%d blockers=%s namespace_op=%s namespace_type=0x%x namespace_id=%llu",
+ __entry->domain_id, __entry->same_exec, __entry->logged,
+ (__entry->blockers_type == LANDLOCK_REQUEST_NAMESPACE_CREATE ||
+ __entry->blockers_type == LANDLOCK_REQUEST_NAMESPACE_ENTER) ?
+ __print_flags(__entry->blockers_access, "|",
+ _LANDLOCK_PERMISSION_BLOCKER_NAMES) :
+ "unknown",
+ __entry->blockers_type == LANDLOCK_REQUEST_NAMESPACE_CREATE ?
+ "create" :
+ __entry->blockers_type == LANDLOCK_REQUEST_NAMESPACE_ENTER ?
+ "enter" : "unknown",
+ __entry->namespace_type, __entry->namespace_id)
);
/**diff --git a/security/landlock/audit.c b/security/landlock/audit.c
index be49ef47b4ea..6d9e54f5deed 100644
--- a/security/landlock/audit.c
+++ b/security/landlock/audit.c
@@ -80,7 +80,8 @@ get_blocker(const enum landlock_request_type type,
WARN_ON_ONCE(access_bit != -1);
return scope_strings[BIT_INDEX(LANDLOCK_SCOPE_SIGNAL)];
- case LANDLOCK_REQUEST_NAMESPACE:
+ case LANDLOCK_REQUEST_NAMESPACE_CREATE:
+ case LANDLOCK_REQUEST_NAMESPACE_ENTER:
case LANDLOCK_REQUEST_CAPABILITY:
if (WARN_ON_ONCE(access_bit >= ARRAY_SIZE(permission_strings)))
return "unknown";
@@ -115,7 +116,8 @@ blocker_prefix(const enum landlock_request_type type)
case LANDLOCK_REQUEST_SCOPE_SIGNAL:
return "scope.";
- case LANDLOCK_REQUEST_NAMESPACE:
+ case LANDLOCK_REQUEST_NAMESPACE_CREATE:
+ case LANDLOCK_REQUEST_NAMESPACE_ENTER:
return _LANDLOCK_PERMISSION_NAMESPACE_NAME ".";
case LANDLOCK_REQUEST_CAPABILITY:
@@ -212,6 +214,10 @@ void landlock_audit_denial(const struct landlock_request *const request,
audit_log_format(ab, "domain=%llx blockers=", youngest_denied->id);
log_blockers(ab, request->type, missing);
+ if (request->type == LANDLOCK_REQUEST_NAMESPACE_CREATE)
+ audit_log_format(ab, " namespace_op=create");
+ else if (request->type == LANDLOCK_REQUEST_NAMESPACE_ENTER)
+ audit_log_format(ab, " namespace_op=enter");
audit_log_lsm_data(ab, &request->audit);
audit_log_end(ab);
diff --git a/security/landlock/log.c b/security/landlock/log.c
index 43efbb95725c..c132b343f0ee 100644
--- a/security/landlock/log.c
+++ b/security/landlock/log.c
@@ -388,7 +388,8 @@ static bool is_valid_request(const struct landlock_request *const request)
return false;
switch (request->type) {
- case LANDLOCK_REQUEST_NAMESPACE:
+ case LANDLOCK_REQUEST_NAMESPACE_CREATE:
+ case LANDLOCK_REQUEST_NAMESPACE_ENTER:
if (WARN_ON_ONCE(request->permission !=
LANDLOCK_PERMISSION_NAMESPACE_USE) ||
WARN_ON_ONCE(request->audit.type != LSM_AUDIT_DATA_NS))@@ -485,7 +486,8 @@ is_denial_quieted(const struct landlock_request *const request,
case LANDLOCK_REQUEST_SCOPE_ABSTRACT_UNIX_SOCKET:
return !!(youngest_denied->quiet_access.scope &
LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET);
- case LANDLOCK_REQUEST_NAMESPACE:
+ case LANDLOCK_REQUEST_NAMESPACE_CREATE:
+ case LANDLOCK_REQUEST_NAMESPACE_ENTER:
return !!(youngest_denied->quiet_permission.ns_types &
landlock_ns_type_to_bit(request->audit.u.ns.ns_type));
case LANDLOCK_REQUEST_CAPABILITY:
diff --git a/security/landlock/log.h b/security/landlock/log.h
index 596feeeb7aa6..641a2c3c78ed 100644
--- a/security/landlock/log.h
+++ b/security/landlock/log.h
@@ -25,7 +25,8 @@ enum landlock_request_type {
LANDLOCK_REQUEST_NET_ACCESS,
LANDLOCK_REQUEST_SCOPE_ABSTRACT_UNIX_SOCKET,
LANDLOCK_REQUEST_SCOPE_SIGNAL,
- LANDLOCK_REQUEST_NAMESPACE,
+ LANDLOCK_REQUEST_NAMESPACE_CREATE,
+ LANDLOCK_REQUEST_NAMESPACE_ENTER,
LANDLOCK_REQUEST_CAPABILITY,
};
diff --git a/security/landlock/ns.c b/security/landlock/ns.c
index 06d9784746fe..3d443599b16f 100644
--- a/security/landlock/ns.c
+++ b/security/landlock/ns.c
@@ -90,6 +90,7 @@ static const struct access_masks ns_permission = {
* check_ns_type - Check namespace use permission
*
* @ns: The namespace being allocated or installed.
+ * @request_type: Namespace operation reported on denial.
*
* Shared check for namespace_init (creation via clone(2), unshare(2),
* open_tree(2), or fsmount(2)) and namespace_install (use via setns(2)): denies@@ -99,7 +100,8 @@ static const struct access_masks ns_permission = {
*
* Return: 0 if allowed, -EPERM if denied.
*/
-static int check_ns_type(struct ns_common *const ns)
+static int check_ns_type(struct ns_common *const ns,
+ const enum landlock_request_type request_type)
{
const struct landlock_cred_security *subject;
size_t denied_layer;@@ -117,7 +119,7 @@ static int check_ns_type(struct ns_common *const ns)
landlock_log_denial(subject,
&(struct landlock_request){
- .type = LANDLOCK_REQUEST_NAMESPACE,
+ .type = request_type,
.audit.type = LSM_AUDIT_DATA_NS,
.permission =
LANDLOCK_PERMISSION_NAMESPACE_USE,@@ -130,13 +132,13 @@ static int check_ns_type(struct ns_common *const ns)
static int hook_namespace_init(struct ns_common *const ns)
{
- return check_ns_type(ns);
+ return check_ns_type(ns, LANDLOCK_REQUEST_NAMESPACE_CREATE);
}
static int hook_namespace_install(const struct nsset *const nsset,
struct ns_common *const ns)
{
- return check_ns_type(ns);
+ return check_ns_type(ns, LANDLOCK_REQUEST_NAMESPACE_ENTER);
}
static struct security_hook_list landlock_hooks[] __ro_after_init = {diff --git a/security/landlock/trace.c b/security/landlock/trace.c
index 995c6b948e16..00cb497eaffb 100644
--- a/security/landlock/trace.c
+++ b/security/landlock/trace.c
@@ -81,7 +81,8 @@ void landlock_trace_denial(
const access_mask_t missing, const bool same_exec, const bool logged)
{
switch (request->type) {
- case LANDLOCK_REQUEST_NAMESPACE:
+ case LANDLOCK_REQUEST_NAMESPACE_CREATE:
+ case LANDLOCK_REQUEST_NAMESPACE_ENTER:
if (trace_landlock_deny_permission_namespace_enabled()) {
const struct landlock_blockers blockers = {
.access = missing,diff --git a/tools/testing/selftests/landlock/ns_test.c b/tools/testing/selftests/landlock/ns_test.c
index 8f387fc47e21..d4a85cbebeae 100644
--- a/tools/testing/selftests/landlock/ns_test.c
+++ b/tools/testing/selftests/landlock/ns_test.c
@@ -1897,11 +1897,14 @@ TEST(setns_inherited_fd)
/* Audit tests */
+#define REGEX_LANDLOCK_NS_CREATE \
+ REGEX_LANDLOCK_PREFIX " blockers=namespace\\.use namespace_op=create"
+
static int matches_log_ns_create(int audit_fd, __u64 ns_type)
{
/* A denied creation logs the ID allocated for the new namespace. */
- static const char log_template[] = REGEX_LANDLOCK_PREFIX
- " blockers=namespace\\.use namespace_type=0x%x namespace_id=[1-9][0-9]*$";
+ static const char log_template[] = REGEX_LANDLOCK_NS_CREATE
+ " namespace_type=0x%x namespace_id=[1-9][0-9]*$";
char log_match[sizeof(log_template) + 10];
int log_match_len;
@@ -1917,12 +1920,12 @@ static int matches_log_ns_create(int audit_fd, __u64 ns_type)
static int matches_log_ns_setns(int audit_fd, __u64 ns_type, __u64 ns_id)
{
static const char log_template[] = REGEX_LANDLOCK_PREFIX
- " blockers=namespace\\.use namespace_type=0x%x namespace_id=%llu$";
+ " blockers=namespace\\.use namespace_op=%s namespace_type=0x%x namespace_id=%llu$";
char log_match[sizeof(log_template) + 32];
int log_match_len;
log_match_len = snprintf(log_match, sizeof(log_match), log_template,
- (unsigned int)ns_type,
+ "enter", (unsigned int)ns_type,
(unsigned long long)ns_id);
if (log_match_len >= sizeof(log_match))
return -E2BIG;@@ -1958,7 +1961,7 @@ FIXTURE_TEARDOWN(ns_audit)
/*
* Verifies that a denied namespace creation produces the expected audit record
- * with the namespace.use blocker string and namespace_type.
+ * with the namespace.use blocker string, namespace type, and create operation.
*/
TEST_F(ns_audit, create_denied)
{@@ -2542,6 +2545,11 @@ static void test_ns_trace_denial(struct __test_metadata *const _metadata,
EXPECT_STRNE("0", field);
if (use_setns)
EXPECT_EQ(expected_ns_id, strtoull(field, NULL, 10));
+ ret = tracefs_extract_field(buf,
+ REGEX_DENY_PERMISSION_NAMESPACE(TRACE_TASK),
+ "namespace_op", field, sizeof(field));
+ ASSERT_EQ(0, ret);
+ EXPECT_STREQ(use_setns ? "enter" : "create", field);
free(buf);
}diff --git a/tools/testing/selftests/landlock/trace.h b/tools/testing/selftests/landlock/trace.h
index 36e8f16171b0..e67f239a8507 100644
--- a/tools/testing/selftests/landlock/trace.h
+++ b/tools/testing/selftests/landlock/trace.h
@@ -185,6 +185,7 @@
"same_exec=[01] " \
"logged=[01] " \
"blockers=[a-z_|]* " \
+ "namespace_op=\\(create\\|enter\\) " \
"namespace_type=0x[0-9a-f]\\+ " \
"namespace_id=[0-9]\\+$"
--
2.56.0