linux-kernel - linux-next: manual merge of the vfs 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: <aNOyrz1bd1WTrZgc@finisterre.sirena.org.uk>
Date: Wed, 24 Sep 2025 10:58:23 +0200
From: Mark Brown <broonie@...nel.org>
To: Al Viro <viro@...iv.linux.org.uk>
Cc: Christian Brauner <brauner@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	NeilBrown <neil@...wn.name>
Subject: linux-next: manual merge of the vfs tree with the vfs-brauner tree

Hi all,

Today's linux-next merge of the vfs tree got conflicts in:

  fs/namei.c
  include/linux/namei.h

between commit:

  3d18f80ce181b ("VFS: rename kern_path_locked() and related functions.")

from the vfs-brauner tree and commit:

  63dbfb077cdad ("done_path_create(): constify path argument")

from the vfs tree (BTW Documentation/filesystems/porting.rst has a
user_path_locked_at() reference).

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.

diff --cc fs/namei.c
index 507ca0d7878d6,ba8bf73d2f9cf..0000000000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -4254,9 -4168,9 +4254,9 @@@ struct dentry *start_creating_path(int 
  	putname(filename);
  	return res;
  }
 -EXPORT_SYMBOL(kern_path_create);
 +EXPORT_SYMBOL(start_creating_path);
  
- void end_creating_path(struct path *path, struct dentry *dentry)
 -void done_path_create(const struct path *path, struct dentry *dentry)
++void end_creating_path(const struct path *path, struct dentry *dentry)
  {
  	if (!IS_ERR(dentry))
  		dput(dentry);
diff --cc include/linux/namei.h
index a7800ef04e761,75c0b665fbd41..0000000000000
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@@ -57,17 -57,13 +57,17 @@@ struct dentry *lookup_one_qstr_excl(con
  				    struct dentry *base,
  				    unsigned int flags);
  extern int kern_path(const char *, unsigned, struct path *);
 +struct dentry *kern_path_parent(const char *name, struct path *parent);
  
 -extern struct dentry *kern_path_create(int, const char *, struct path *, unsigned int);
 -extern struct dentry *user_path_create(int, const char __user *, struct path *, unsigned int);
 -extern void done_path_create(const struct path *, struct dentry *);
 -extern struct dentry *kern_path_locked(const char *, struct path *);
 -extern struct dentry *kern_path_locked_negative(const char *, struct path *);
 -extern struct dentry *user_path_locked_at(int , const char __user *, struct path *);
 +extern struct dentry *start_creating_path(int, const char *, struct path *, unsigned int);
 +extern struct dentry *start_creating_user_path(int, const char __user *, struct path *, unsigned int);
- extern void end_creating_path(struct path *, struct dentry *);
++extern void end_creating_path(const struct path *, struct dentry *);
 +extern struct dentry *start_removing_path(const char *, struct path *);
 +extern struct dentry *start_removing_user_path_at(int , const char __user *, struct path *);
 +static inline void end_removing_path(struct path *path , struct dentry *dentry)
 +{
 +	end_creating_path(path, dentry);
 +}
  int vfs_path_parent_lookup(struct filename *filename, unsigned int flags,
  			   struct path *parent, struct qstr *last, int *type,
  			   const struct path *root);

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)