linux-kernel - linux-next: manual merge of the landlock tree with the vfs-brauner tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251121153059.48e3d2fa@canb.auug.org.au>
Date: Fri, 21 Nov 2025 15:30:59 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mickaël Salaün <mic@...ikod.net>, Christian
 Brauner <brauner@...nel.org>
Cc: Ian Kent <raven@...maw.net>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the landlock tree with the vfs-brauner
 tree

Hi all,

Today's linux-next merge of the landlock tree got a conflict in:

  include/linux/fs.h

between commit:

  922a6f34c175 ("autofs: dont trigger mount if it cant succeed")

from the vfs-brauner tree and commit:

  f0c02fe6ad93 ("landlock: Fix handling of disconnected directories")

from the landlock tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/fs.h
index 474f728d1a6f,74e0d599e9fd..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2839,7 -3269,7 +2839,8 @@@ extern struct file * open_exec(const ch
  /* fs/dcache.c -- generic fs support functions */
  extern bool is_subdir(struct dentry *, struct dentry *);
  extern bool path_is_under(const struct path *, const struct path *);
 +u64 vfsmount_to_propagation_flags(struct vfsmount *mnt);
+ bool path_connected(struct vfsmount *mnt, struct dentry *dentry);
  
  extern char *file_path(struct file *, char *, int);
  

Content of type "application/pgp-signature" skipped