Replace the get_raw_handled_net_accesses() implementation with a call to
landlock_match_ruleset().
Cc: Günther Noack <gnoack@google.com>
Cc: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Cc: Mikhail Ivanov <ivanov.mikhail1@huawei-partners.com>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20241014124835.1152246-3-mic@digikod.net
---
Changes since v1:
* Rename the all_net mask to any_net.
---
security/landlock/net.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/security/landlock/net.c b/security/landlock/net.c
index c8bcd29bde09..fdc1bb0a9c5d 100644
--- a/security/landlock/net.c
+++ b/security/landlock/net.c
@@ -39,26 +39,13 @@ int landlock_append_net_rule(struct landlock_ruleset *const ruleset,
return err;
}
-static access_mask_t
-get_raw_handled_net_accesses(const struct landlock_ruleset *const domain)
-{
- access_mask_t access_dom = 0;
- size_t layer_level;
-
- for (layer_level = 0; layer_level < domain->num_layers; layer_level++)
- access_dom |= landlock_get_net_access_mask(domain, layer_level);
- return access_dom;
-}
-
static const struct landlock_ruleset *get_current_net_domain(void)
{
- const struct landlock_ruleset *const dom =
- landlock_get_current_domain();
-
- if (!dom || !get_raw_handled_net_accesses(dom))
- return NULL;
+ const union access_masks any_net = {
+ .net = ~0,
+ };
- return dom;
+ return landlock_match_ruleset(landlock_get_current_domain(), any_net);
}
static int current_check_access_socket(struct socket *const sock,
--
2.47.0