[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Zy-oriCJELJSBYFZ@google.com>
Date: Sat, 9 Nov 2024 19:23:42 +0100
From: "Günther Noack" <gnoack@...gle.com>
To: "Mickaël Salaün" <mic@...ikod.net>
Cc: Mikhail Ivanov <ivanov.mikhail1@...wei-partners.com>,
Konstantin Meskhidze <konstantin.meskhidze@...wei.com>, Paul Moore <paul@...l-moore.com>,
Tahera Fahimi <fahimitahera@...il.com>, linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org
Subject: Re: [PATCH v4 2/3] landlock: Refactor network access mask management
On Sat, Nov 09, 2024 at 12:08:55PM +0100, Mickaël Salaün wrote:
> Replace get_raw_handled_net_accesses() and get_current_net_domain() with
> a call to landlock_match_ruleset().
>
> Cc: Günther Noack <gnoack@...gle.com>
> Cc: Konstantin Meskhidze <konstantin.meskhidze@...wei.com>
> Cc: Mikhail Ivanov <ivanov.mikhail1@...wei-partners.com>
> Signed-off-by: Mickaël Salaün <mic@...ikod.net>
> Link: https://lore.kernel.org/r/20241109110856.222842-3-mic@digikod.net
> ---
>
> Changes since v2:
> * Replace get_current_net_domain() with explicit call to
> landlock_match_ruleset().
>
> Changes since v1:
> * Rename the all_net mask to any_net.
> ---
> security/landlock/net.c | 28 ++++++----------------------
> 1 file changed, 6 insertions(+), 22 deletions(-)
>
> diff --git a/security/landlock/net.c b/security/landlock/net.c
> index c8bcd29bde09..d5dcc4407a19 100644
> --- a/security/landlock/net.c
> +++ b/security/landlock/net.c
> @@ -39,27 +39,9 @@ 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;
> -
> - return dom;
> -}
> +static const struct access_masks any_net = {
> + .net = ~0,
> +};
>
> static int current_check_access_socket(struct socket *const sock,
> struct sockaddr *const address,
> @@ -72,7 +54,9 @@ 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 = get_current_net_domain();
> + const struct landlock_ruleset *const dom =
> + landlock_get_applicable_domain(landlock_get_current_domain(),
> + any_net);
>
> if (!dom)
> return 0;
> --
> 2.47.0
>
Reviewed-by: Günther Noack <gnoack@...gle.com>
—Günther
Powered by blists - more mailing lists