[PATCH v5 bpf-next 2/5] landlock: Use path_walk_parent()
Mickaël Salaün
mic at digikod.net
Thu Jul 3 18:29:40 UTC 2025
On Mon, Jun 16, 2025 at 11:11:13PM -0700, Song Liu wrote:
> Use path_walk_parent() to walk a path up to its parent.
>
> No functional changes intended.
Using this helper actualy fixes the issue highlighted by Al. Even if it
was reported after the first version of this patch series, the issue
should be explained in the commit message and these tags should be
added:
Reported-by: Al Viro <viro at zeniv.linux.org.uk>
Closes: https://lore.kernel.org/r/20250529231018.GP2023217@ZenIV
Fixes: cb2c7d1a1776 ("landlock: Support filesystem access-control")
I like this new helper but we should have a clear plan to be able to
call such helper in a RCU read-side critical section before we merge
this series. We're still waiting for Christian.
I sent a patch to fix the handling of disconnected directories for
Landlock, and it will need to be backported:
https://lore.kernel.org/all/20250701183812.3201231-1-mic@digikod.net/
Unfortunately a rebase would be needed for the path_walk_parent patch,
but I can take it in my tree if everyone is OK.
However, users of path_walk_parent() would still have to properly deal
with such disconnected directories. The Landlock fix I sent takes a
safe approach by handling disconnected directories such as only their
mount point is actually taken into account for access control decision
(see rationale in the patch series). I'm wondering if
path_walk_parent() should not help its users avoid the same issue, or at
least force them to make an explicit and informed choice.
>
> Signed-off-by: Song Liu <song at kernel.org>
> ---
> security/landlock/fs.c | 30 ++++++++----------------------
> 1 file changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/security/landlock/fs.c b/security/landlock/fs.c
> index 6fee7c20f64d..e26ab8c34dd4 100644
> --- a/security/landlock/fs.c
> +++ b/security/landlock/fs.c
> @@ -837,8 +837,8 @@ static bool is_access_to_paths_allowed(
> * restriction.
> */
> while (true) {
> - struct dentry *parent_dentry;
> const struct landlock_rule *rule;
> + struct path root = {};
>
> /*
> * If at least all accesses allowed on the destination are
> @@ -895,34 +895,20 @@ static bool is_access_to_paths_allowed(
> /* Stops when a rule from each layer grants access. */
> if (allowed_parent1 && allowed_parent2)
> break;
> -jump_up:
> - if (walker_path.dentry == walker_path.mnt->mnt_root) {
> - if (follow_up(&walker_path)) {
> - /* Ignores hidden mount points. */
> - goto jump_up;
> - } else {
> - /*
> - * Stops at the real root. Denies access
> - * because not all layers have granted access.
> - */
> - break;
> - }
> - }
> - if (unlikely(IS_ROOT(walker_path.dentry))) {
> +
> + if (unlikely(IS_ROOT(walker_path.dentry)) &&
> + (walker_path.mnt->mnt_flags & MNT_INTERNAL)) {
This would not fit well with the ongoing Landlock fix because
!MNT_INTERNAL root directories should also be handled specifically, but
only if they are not mount points.
> /*
> * Stops at disconnected root directories. Only allows
> * access to internal filesystems (e.g. nsfs, which is
> * reachable through /proc/<pid>/ns/<namespace>).
> */
> - if (walker_path.mnt->mnt_flags & MNT_INTERNAL) {
> - allowed_parent1 = true;
> - allowed_parent2 = true;
> - }
> + allowed_parent1 = true;
> + allowed_parent2 = true;
> break;
> }
> - parent_dentry = dget_parent(walker_path.dentry);
> - dput(walker_path.dentry);
> - walker_path.dentry = parent_dentry;
> + if (path_walk_parent(&walker_path, &root))
> + break;
> }
> path_put(&walker_path);
>
> --
> 2.47.1
>
>
More information about the Linux-security-module-archive
mailing list