Commit 8c67da5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.14-rc2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:

 - Fix fsnotify FMODE_NONOTIFY* handling.

   This also disables fsnotify on all pseudo files by default apart from
   very select exceptions. This carries a regression risk so we need to
   watch out and adapt accordingly. However, it is overall a significant
   improvement over the current status quo where every rando file can
   get fsnotify enabled.

 - Cleanup and simplify lockref_init() after recent lockref changes.

 - Fix vboxfs build with gcc-15.

 - Add an assert into inode_set_cached_link() to catch corrupt links.

 - Allow users to also use an empty string check to detect whether a
   given mount option string was empty or not.

 - Fix how security options were appended to statmount()'s ->mnt_opt
   field.

 - Fix statmount() selftests to always check the returned mask.

 - Fix uninitialized value in vfs_statx_path().

 - Fix pidfs_ioctl() sanity checks to guard against ioctl() overloading
   and preserve extensibility.

* tag 'vfs-6.14-rc2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  vfs: sanity check the length passed to inode_set_cached_link()
  pidfs: improve ioctl handling
  fsnotify: disable pre-content and permission events by default
  selftests: always check mask returned by statmount(2)
  fsnotify: disable notification by default for all pseudo files
  fs: fix adding security options to statmount.mnt_opt
  fsnotify: use accessor to set FMODE_NONOTIFY_*
  lockref: remove count argument of lockref_init
  gfs2: switch to lockref_init(..., 1)
  gfs2: use lockref_init for gl_lockref
  statmount: let unset strings be empty
  vboxsf: fix building with GCC 15
  fs/stat.c: avoid harmless garbage value problem in vfs_statx_path()
parents 94b481f7 37d11cfc

drivers/tty/pty.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int ptmx_open(struct inode *inode, struct file *filp) 
	nonseekable_open(inode, filp);



	/* We refuse fsnotify events on ptmx, since it's a shared resource */

	filp->f_mode |= FMODE_NONOTIFY;

	file_set_fsnotify_mode(filp, FMODE_NONOTIFY);



	retval = tty_alloc_file(filp);

	if (retval)

fs/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -1700,7 +1700,7 @@ static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) 
	smp_store_release(&dentry->d_name.name, dname); /* ^^^ */



	dentry->d_flags = 0;

	lockref_init(&dentry->d_lockref, 1);

	lockref_init(&dentry->d_lockref);

	seqcount_spinlock_init(&dentry->d_seq, &dentry->d_lock);

	dentry->d_inode = NULL;

	dentry->d_parent = dentry;

fs/erofs/zdata.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static int z_erofs_register_pcluster(struct z_erofs_frontend *fe) 
	if (IS_ERR(pcl))

		return PTR_ERR(pcl);



	lockref_init(&pcl->lockref, 1); /* one ref for this request */

	lockref_init(&pcl->lockref); /* one ref for this request */

	pcl->algorithmformat = map->m_algorithmformat;

	pcl->length = 0;

	pcl->partial = true;

fs/file_table.c

+16 −0
Original line number Diff line number Diff line
@@ -194,6 +194,11 @@ static int init_file(struct file *f, int flags, const struct cred *cred) 
	 * refcount bumps we should reinitialize the reused file first.

	 */

	file_ref_init(&f->f_ref, 1);

	/*

	 * Disable permission and pre-content events for all files by default.

	 * They may be enabled later by file_set_fsnotify_mode_from_watchers().

	 */

	file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);

	return 0;

}
@@ -375,7 +380,13 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt, 
	if (IS_ERR(file)) {

		ihold(inode);

		path_put(&path);

		return file;

	}

	/*

	 * Disable all fsnotify events for pseudo files by default.

	 * They may be enabled by caller with file_set_fsnotify_mode().

	 */

	file_set_fsnotify_mode(file, FMODE_NONOTIFY);

	return file;

}

EXPORT_SYMBOL(alloc_file_pseudo);
@@ -400,6 +411,11 @@ struct file *alloc_file_pseudo_noaccount(struct inode *inode, 
		return file;

	}

	file_init_path(file, &path, fops);

	/*

	 * Disable all fsnotify events for pseudo files by default.

	 * They may be enabled by caller with file_set_fsnotify_mode().

	 */

	file_set_fsnotify_mode(file, FMODE_NONOTIFY);

	return file;

}

EXPORT_SYMBOL_GPL(alloc_file_pseudo_noaccount);

fs/gfs2/glock.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,8 +1201,8 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, 
	if (glops->go_instantiate)

		gl->gl_flags |= BIT(GLF_INSTANTIATE_NEEDED);

	gl->gl_name = name;

	lockref_init(&gl->gl_lockref);

	lockdep_set_subclass(&gl->gl_lockref.lock, glops->go_subclass);

	gl->gl_lockref.count = 1;

	gl->gl_state = LM_ST_UNLOCKED;

	gl->gl_target = LM_ST_UNLOCKED;

	gl->gl_demote_state = LM_ST_EXCLUSIVE;