From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1165155726 for ; Sat, 9 Nov 2024 18:23:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731176627; cv=none; b=bVl8ovR4/Evf4D/XiDmcm9HK3aIts4V02+KO1JlGgppROCkAoobQEeAaKvq7g2/4DJ4tzn+W7Qh0IkyccDr+knWxwILhtct+D9ppVsJDB3G3f+/DWQptE3OeyjBpw2A8jcL7ct3IfcwhdOwS1/zXuVsWcHJdqRwdGRH6oXI2JUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731176627; c=relaxed/simple; bh=mlbBETcupgCb414Ky4zumxeZ+96zYQqjYsHF7GElXuM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pUYqN8bMjJq6OaZNzkHwh8eHuGEneliX528GAHof8OICqQU9/dIfDfID38Crwb8gsJvuVUUi2YmwJS6OuzDmJsOKIYiW7jCnpS9GmTA+PSXPNLVSk6MfiTy7coSgvAPgDvchqEG4Xi8I7vC4Oyugt5aq1yw/1ZYkYFi1S9M12HI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--gnoack.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2hgE0E3O; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--gnoack.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2hgE0E3O" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e0b8fa94718so5737377276.0 for ; Sat, 09 Nov 2024 10:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731176624; x=1731781424; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=DNMtpNh0EyiH5Cih+rXzvOX64NKOibAYniapXi4mnKE=; b=2hgE0E3Oa1DH8ML4I9iVLQQhE0QlSrKMafxLOWtq072+oPEEQAKYbkLFKIq0FSb5CM Jg8ka8YYfy19Rt43c1AQQniEVOqfnfftTnKSUyl7P+7JPYBPhp9XD5nuDinNcoZWz90N gBpjIhPAlQhRDfoh8LIx0ifu7vnwyup8JGPLJsbf2Q7zuczCgQevZYoN6thj/S4DrTIh ZEGPNMJZwjuO+L4iFxL9h8iU35tbb+/Dj2aluZJAGc48b7+OrDfJPRtVS4kp1FosqKIC RHIneFkZQf6wNa9YmihVrUgJY4jjWnZP6z0e39cBrM351G16KKAzONOLlszB0BurXuaA Tm9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731176624; x=1731781424; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=DNMtpNh0EyiH5Cih+rXzvOX64NKOibAYniapXi4mnKE=; b=GamrqF9OSFXw++Xolxr5hxf19IAXZstnaIpmBjz9kB08XIQguZmzoBEyNfge1bh2Dr jnCjAmMFDE8VYpeBegXWFuizPlsej/jWNsqLtby2oZGVuN3Axxw+GD5ffHzi6e7WHH4H 9PSGVFcc5LURwtuc0jpEwN/zdfa7rjxA9sdyse8bkRikTZsRd9f7Sn9qJRzm1vd7Mj9D Ttmmhrv9zfawUAMrecF+W6S2k8rZ7d1we8EJY8wA0CNi5kVY4ei7JHMZwCP2ytCp74HG TVEvfLIDvFEonk5MvPJHbxSrU6naKWZzgOwR8UYbMgVtMJOmajYDnLARc2HFynriCgu7 X81g== X-Forwarded-Encrypted: i=1; AJvYcCVpH8FAE9g+vjtSp7PMxRb3JdQujt0BwmwSW8AraWrOxSZKKm6M6hOCeVVRT2jOe2HTFgsl2EYGXpt2op0=@vger.kernel.org X-Gm-Message-State: AOJu0YywIkjS+l2tH6rUREzoAKWwtVqgWD1bM2/hjQz25JDSx8ScRX6h fHGjyp+vBBJz+BRvsx9pHFyH74sn7jQaSrpMI1DaeIF/dbObu9gPIfFkqoZM6vqng5S0IoyTk2/ lyA== X-Google-Smtp-Source: AGHT+IFb2ALdev8rkS2MP1OpmqtRhIJDwy41Rc8Ssp6CChyEzIsFEJl8h3SRKE9oiK0DStU4Ojd1+peHK9s= X-Received: from swim.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:1605]) (user=gnoack job=sendgmr) by 2002:a25:acd3:0:b0:e30:da65:7240 with SMTP id 3f1490d57ef6-e337f85bbf5mr14424276.3.1731176624715; Sat, 09 Nov 2024 10:23:44 -0800 (PST) Date: Sat, 9 Nov 2024 19:23:42 +0100 In-Reply-To: <20241109110856.222842-3-mic@digikod.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241109110856.222842-1-mic@digikod.net> <20241109110856.222842-3-mic@digikod.net> Message-ID: Subject: Re: [PATCH v4 2/3] landlock: Refactor network access mask management From: "=?utf-8?Q?G=C3=BCnther?= Noack" To: "=?utf-8?Q?Micka=C3=ABl_Sala=C3=BCn?=" Cc: Mikhail Ivanov , Konstantin Meskhidze , Paul Moore , Tahera Fahimi , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Sat, Nov 09, 2024 at 12:08:55PM +0100, Micka=C3=ABl Sala=C3=BCn wrote: > Replace get_raw_handled_net_accesses() and get_current_net_domain() with > a call to landlock_match_ruleset(). >=20 > Cc: G=C3=BCnther Noack > Cc: Konstantin Meskhidze > Cc: Mikhail Ivanov > Signed-off-by: Micka=C3=ABl Sala=C3=BCn > Link: https://lore.kernel.org/r/20241109110856.222842-3-mic@digikod.net > --- >=20 > Changes since v2: > * Replace get_current_net_domain() with explicit call to > landlock_match_ruleset(). >=20 > Changes since v1: > * Rename the all_net mask to any_net. > --- > security/landlock/net.c | 28 ++++++---------------------- > 1 file changed, 6 insertions(+), 22 deletions(-) >=20 > 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; > } > =20 > -static access_mask_t > -get_raw_handled_net_accesses(const struct landlock_ruleset *const domain= ) > -{ > - access_mask_t access_dom =3D 0; > - size_t layer_level; > - > - for (layer_level =3D 0; layer_level < domain->num_layers; layer_level++= ) > - access_dom |=3D 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 =3D > - landlock_get_current_domain(); > - > - if (!dom || !get_raw_handled_net_accesses(dom)) > - return NULL; > - > - return dom; > -} > +static const struct access_masks any_net =3D { > + .net =3D ~0, > +}; > =20 > 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 *c= onst sock, > struct landlock_id id =3D { > .type =3D LANDLOCK_KEY_NET_PORT, > }; > - const struct landlock_ruleset *const dom =3D get_current_net_domain(); > + const struct landlock_ruleset *const dom =3D > + landlock_get_applicable_domain(landlock_get_current_domain(), > + any_net); > =20 > if (!dom) > return 0; > --=20 > 2.47.0 >=20 Reviewed-by: G=C3=BCnther Noack =E2=80=94G=C3=BCnther