mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-07-05 13:25:20 +02:00
landlock: Refactor network access mask management
Replace get_raw_handled_net_accesses() and get_current_net_domain() with a call to landlock_get_applicable_domain(). Cc: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> Cc: Mikhail Ivanov <ivanov.mikhail1@huawei-partners.com> Reviewed-by: Günther Noack <gnoack@google.com> Link: https://lore.kernel.org/r/20241109110856.222842-3-mic@digikod.net Signed-off-by: Mickaël Salaün <mic@digikod.net>
This commit is contained in:
parent
0c0effb07f
commit
8376226e5f
|
@ -39,27 +39,9 @@ int landlock_append_net_rule(struct landlock_ruleset *const ruleset,
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static access_mask_t
|
static const struct access_masks any_net = {
|
||||||
get_raw_handled_net_accesses(const struct landlock_ruleset *const domain)
|
.net = ~0,
|
||||||
{
|
};
|
||||||
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;
|
|
||||||
|
|
||||||
return dom;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int current_check_access_socket(struct socket *const sock,
|
static int current_check_access_socket(struct socket *const sock,
|
||||||
struct sockaddr *const address,
|
struct sockaddr *const address,
|
||||||
|
@ -72,7 +54,9 @@ static int current_check_access_socket(struct socket *const sock,
|
||||||
struct landlock_id id = {
|
struct landlock_id id = {
|
||||||
.type = LANDLOCK_KEY_NET_PORT,
|
.type = LANDLOCK_KEY_NET_PORT,
|
||||||
};
|
};
|
||||||
const struct landlock_ruleset *const dom = get_current_net_domain();
|
const struct landlock_ruleset *const dom =
|
||||||
|
landlock_get_applicable_domain(landlock_get_current_domain(),
|
||||||
|
any_net);
|
||||||
|
|
||||||
if (!dom)
|
if (!dom)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user