From: Mateusz Guzik Date: Thu, 20 Jun 2024 12:03:59 +0000 (+0200) Subject: vfs: reorder checks in may_create_in_sticky X-Git-Tag: v6.11-rc1~242^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e362bd5eecdd7ccafc9611a108a53423ccd5065;p=thirdparty%2Fkernel%2Flinux.git vfs: reorder checks in may_create_in_sticky The routine is called for all directories on file creation and weirdly postpones the check if the dir is sticky to begin with. Instead it first checks fifos and regular files (in that order), while avoidably pulling globals. No functional changes. Signed-off-by: Mateusz Guzik Link: https://lore.kernel.org/r/20240620120359.151258-1-mjguzik@gmail.com Reviewed-by: Jan Kara Signed-off-by: Christian Brauner --- diff --git a/fs/namei.c b/fs/namei.c index 3d3674c21d3c4..8b40991cb59e0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1246,9 +1246,9 @@ static int may_create_in_sticky(struct mnt_idmap *idmap, umode_t dir_mode = nd->dir_mode; vfsuid_t dir_vfsuid = nd->dir_vfsuid; - if ((!sysctl_protected_fifos && S_ISFIFO(inode->i_mode)) || - (!sysctl_protected_regular && S_ISREG(inode->i_mode)) || - likely(!(dir_mode & S_ISVTX)) || + if (likely(!(dir_mode & S_ISVTX)) || + (S_ISREG(inode->i_mode) && !sysctl_protected_regular) || + (S_ISFIFO(inode->i_mode) && !sysctl_protected_fifos) || vfsuid_eq(i_uid_into_vfsuid(idmap, inode), dir_vfsuid) || vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode), current_fsuid())) return 0;