Unverified Commit 1219e0fe authored by Amir Goldstein's avatar Amir Goldstein Committed by Christian Brauner
Browse files

fs: move initializing f_mode before file_ref_init() 



The comment above file_ref_init() says:
"We're SLAB_TYPESAFE_BY_RCU so initialize f_ref last."
but file_set_fsnotify_mode() was added after file_ref_init().

Move it right after setting f_mode, where it makes more sense.

Fixes: 711f9b8f ("fsnotify: disable pre-content and permission events by default")
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Link: https://patch.msgid.link/20260109211536.3565697-1-amir73il@gmail.com


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 46329a9d

fs/file_table.c

+5 −5
Original line number Diff line number Diff line
@@ -176,6 +176,11 @@ static int init_file(struct file *f, int flags, const struct cred *cred) 


	f->f_flags	= flags;

	f->f_mode	= OPEN_FMODE(flags);

	/*

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

	 * They may be enabled later by fsnotify_open_perm_and_set_mode().

	 */

	file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);



	f->f_op		= NULL;

	f->f_mapping	= NULL;
@@ -197,11 +202,6 @@ 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 fsnotify_open_perm_and_set_mode().

	 */

	file_set_fsnotify_mode(f, FMODE_NONOTIFY_PERM);

	return 0;

}