f2fs: use generic helpers for FS_IOC_{SETFLAGS,FSSETXATTR}
Subsystems (2)
cover f2fs: use generic helpers for FS_IOC_{SETFLAGS,FSSETXATTR}
This series converts f2fs to use the new VFS helper functions that check the parameters of the FS_IOC_SETFLAGS and FS_IOC_FSSETXATTR ioctls.
This applies to the merge of the f2fs/dev and xfs/vfs-for-next branches:
https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/log/?h=dev https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git/log/?h=vfs-for-next
i.e., this series will apply to mainline after these two branches get merged into it for 5.3. Don't apply it to the f2fs tree by itself yet.
See: https://lore.kernel.org/lkml/[email protected]/T/#u
Eric Biggers (3):
f2fs: use generic checking and prep function for FS_IOC_SETFLAGS
f2fs: use generic checking function for FS_IOC_FSSETXATTR
f2fs: remove redundant check from f2fs_setflags_common()
fs/f2fs/file.c | 63 ++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 40 deletions(-)
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
PATCH 1/3 f2fs: use generic checking and prep function for FS_IOC_SETFLAGS
From: Eric Biggers <[email protected]>
Make the f2fs implementation of FS_IOC_SETFLAGS use the new VFS helper function vfs_ioc_setflags_prepare().
This is based on a patch from Darrick Wong, but reworked to apply after commit 360985573b55 ("f2fs: separate f2fs i_flags from fs_flags and ext4 i_flags").
Originally-from: Darrick J. Wong <[email protected]>
--- fs/f2fs/file.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/file.c +8 -1
@@ -1765,7 +1765,8 @@ static int f2fs_ioc_getflags(struct file *filp, unsigned long arg)static int f2fs_ioc_setflags (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp); -u32 fsflags; +struct f2fs_inode_info *fi =F2FS_I (inode); +u32 fsflags, old_fsflags;u32 iflags;int ret;
@@ -1789,8 +1790,14 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)inode_lock (inode); + old_fsflags =f2fs_iflags_to_fsflags (fi->i_flags); + ret =vfs_ioc_setflags_prepare (inode, old_fsflags, fsflags); +if (ret) + goto out; + ret =f2fs_setflags_common (inode, iflags,f2fs_fsflags_to_iflags (F2FS_SETTABLE_FS_FL )); +out:inode_unlock (inode);mnt_drop_write_file (filp);return ret;
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Re: [PATCH 1/3] f2fs: use generic checking and prep function for FS_IOC_SETFLAGS
Quoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Make the f2fs implementation of
FS_IOC_SETFLAGSuse the new VFS helper functionvfs_ioc_setflags_prepare().This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
Thanks,
Re: [PATCH 1/3] f2fs: use generic checking and prep function for FS_IOC_SETFLAGS
In reply to Eric BiggersQuoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Make the f2fs implementation of
FS_IOC_SETFLAGSuse the new VFS helper functionvfs_ioc_setflags_prepare().This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
LGTM,
--D
Quoted 36 lines
--- fs/f2fs/file.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)fs/f2fs/file.c +8
-1@@ -1765,7 +1765,8 @@ static int f2fs_ioc_getflags(struct file *filp, unsigned long arg)static int f2fs_ioc_setflags (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp); -u32 fsflags; +struct f2fs_inode_info *fi =F2FS_I (inode); +u32 fsflags, old_fsflags;u32 iflags;int ret;@@ -1789,8 +1790,14 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)inode_lock (inode); + old_fsflags =f2fs_iflags_to_fsflags (fi->i_flags); + ret =vfs_ioc_setflags_prepare (inode, old_fsflags, fsflags); +if (ret) + goto out; + ret =f2fs_setflags_common (inode, iflags,f2fs_fsflags_to_iflags (F2FS_SETTABLE_FS_FL )); +out:inode_unlock (inode);mnt_drop_write_file (filp);return ret;Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 2/3 f2fs: use generic checking function for FS_IOC_FSSETXATTR
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Make the f2fs implementation of FS_IOC_FSSETXATTR use the new VFS helper function vfs_ioc_fssetxattr_check(), and remove the project quota check since it's now done by the helper function.
This is based on a patch from Darrick Wong, but reworked to apply after commit 360985573b55 ("f2fs: separate f2fs i_flags from fs_flags and ext4 i_flags").
Originally-from: Darrick J. Wong <[email protected]>
--- fs/f2fs/file.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-)
fs/f2fs/file.c +14 -31
@@ -2857,52 +2857,32 @@ static inline u32 f2fs_xflags_to_iflags(u32 xflags)return iflags; } -static int f2fs_ioc_fsgetxattr (struct file *filp,unsigned long arg) +static void f2fs_fill_fsxattr (struct inode *inode,struct fsxattr *fa) { -struct inode *inode =file_inode (filp);struct f2fs_inode_info *fi =F2FS_I (inode); -struct fsxattr fa; -memset (&fa,0 ,sizeof (struct fsxattr )); - fa.fsx_xflags =f2fs_iflags_to_xflags (fi->i_flags); +simple_fill_fsxattr (fa,f2fs_iflags_to_xflags (fi->i_flags));if (f2fs_sb_has_project_quota (F2FS_I_SB (inode))) - fa.fsx_projid = (__u32 )from_kprojid (&init_user_ns, - fi->i_projid); - -if (copy_to_user ((struct fsxattr __user *)arg, &fa,sizeof (fa))) -return -EFAULT ; -return 0 ; + fa->fsx_projid =from_kprojid (&init_user_ns, fi->i_projid); } -static int f2fs_ioctl_check_project (struct inode *inode,struct fsxattr *fa) +static int f2fs_ioc_fsgetxattr (struct file *filp,unsigned long arg) { -/* -* Project Quota ID state is only allowed to change from within the init -* namespace. Enforce that restriction only if we are trying to change -* the quota ID state. Everything else is allowed in user namespaces. -*/ -if (current_user_ns () == &init_user_ns) -return 0 ; - -if (__kprojid_val (F2FS_I (inode)->i_projid) != fa->fsx_projid) -return -EINVAL ; +struct inode *inode =file_inode (filp); +struct fsxattr fa; -if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL ) { -if (!(fa->fsx_xflags &FS_XFLAG_PROJINHERIT )) -return -EINVAL ; - }else { -if (fa->fsx_xflags &FS_XFLAG_PROJINHERIT ) -return -EINVAL ; - } +f2fs_fill_fsxattr (inode, &fa); +if (copy_to_user ((struct fsxattr __user *)arg, &fa,sizeof (fa))) +return -EFAULT ;return 0 ; }static int f2fs_ioc_fssetxattr (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp); -struct fsxattr fa; +struct fsxattr fa, old_fa;u32 iflags;int err;
@@ -2925,9 +2905,12 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)return err;inode_lock (inode); - err =f2fs_ioctl_check_project (inode, &fa); + +f2fs_fill_fsxattr (inode, &old_fa); + err =vfs_ioc_fssetxattr_check (inode, &old_fa, &fa);if (err) goto out; + err =f2fs_setflags_common (inode, iflags,f2fs_xflags_to_iflags (F2FS_SUPPORTED_XFLAGS ));if (err)
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Re: [PATCH 2/3] f2fs: use generic checking function for FS_IOC_FSSETXATTR
Quoted 6 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Make the f2fs implementation of
FS_IOC_FSSETXATTRuse the new VFS helper functionvfs_ioc_fssetxattr_check(), and remove the project quota check since it's now done by the helper function.
Quoted 6 lines
This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
Thanks,
Re: [PATCH 2/3] f2fs: use generic checking function for FS_IOC_FSSETXATTR
In reply to Eric BiggersQuoted 6 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Make the f2fs implementation of
FS_IOC_FSSETXATTRuse the new VFS helper functionvfs_ioc_fssetxattr_check(), and remove the project quota check since it's now done by the helper function.
Quoted 6 lines
This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
Looks ok,
--D
Quoted 88 lines
--- fs/f2fs/file.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-)fs/f2fs/file.c +14
-31@@ -2857,52 +2857,32 @@ static inline u32 f2fs_xflags_to_iflags(u32 xflags)return iflags; } -static int f2fs_ioc_fsgetxattr (struct file *filp,unsigned long arg) +static void f2fs_fill_fsxattr (struct inode *inode,struct fsxattr *fa) { -struct inode *inode =file_inode (filp);struct f2fs_inode_info *fi =F2FS_I (inode); -struct fsxattr fa; -memset (&fa,0 ,sizeof (struct fsxattr )); - fa.fsx_xflags =f2fs_iflags_to_xflags (fi->i_flags); +simple_fill_fsxattr (fa,f2fs_iflags_to_xflags (fi->i_flags));if (f2fs_sb_has_project_quota (F2FS_I_SB (inode))) - fa.fsx_projid = (__u32 )from_kprojid (&init_user_ns, - fi->i_projid); - -if (copy_to_user ((struct fsxattr __user *)arg, &fa,sizeof (fa))) -return -EFAULT ; -return 0 ; + fa->fsx_projid =from_kprojid (&init_user_ns, fi->i_projid); } -static int f2fs_ioctl_check_project (struct inode *inode,struct fsxattr *fa) +static int f2fs_ioc_fsgetxattr (struct file *filp,unsigned long arg) { -/* -* Project Quota ID state is only allowed to change from within the init -* namespace. Enforce that restriction only if we are trying to change -* the quota ID state. Everything else is allowed in user namespaces. -*/ -if (current_user_ns () == &init_user_ns) -return 0 ; - -if (__kprojid_val (F2FS_I (inode)->i_projid) != fa->fsx_projid) -return -EINVAL ; +struct inode *inode =file_inode (filp); +struct fsxattr fa; -if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL ) { -if (!(fa->fsx_xflags &FS_XFLAG_PROJINHERIT )) -return -EINVAL ; - }else { -if (fa->fsx_xflags &FS_XFLAG_PROJINHERIT ) -return -EINVAL ; - } +f2fs_fill_fsxattr (inode, &fa); +if (copy_to_user ((struct fsxattr __user *)arg, &fa,sizeof (fa))) +return -EFAULT ;return 0 ; }static int f2fs_ioc_fssetxattr (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp); -struct fsxattr fa; +struct fsxattr fa, old_fa;u32 iflags;int err;@@ -2925,9 +2905,12 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)return err;inode_lock (inode); - err =f2fs_ioctl_check_project (inode, &fa); + +f2fs_fill_fsxattr (inode, &old_fa); + err =vfs_ioc_fssetxattr_check (inode, &old_fa, &fa);if (err) goto out; + err =f2fs_setflags_common (inode, iflags,f2fs_xflags_to_iflags (F2FS_SUPPORTED_XFLAGS ));if (err)Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 3/3 f2fs: remove redundant check from f2fs_setflags_common()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that f2fs_ioc_setflags() and f2fs_ioc_fssetxattr() call the VFS helper functions which check for permission to change the immutable and append-only flags, it's no longer needed to do this check in f2fs_setflags_common() too. So remove it.
This is based on a patch from Darrick Wong, but reworked to apply after commit 360985573b55 ("f2fs: separate f2fs i_flags from fs_flags and ext4 i_flags").
Originally-from: Darrick J. Wong <[email protected]>
--- fs/f2fs/file.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
fs/f2fs/file.c +1 -8
@@ -1648,19 +1648,12 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)static int f2fs_setflags_common (struct inode *inode,u32 iflags,u32 mask) {struct f2fs_inode_info *fi =F2FS_I (inode); -u32 oldflags;/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode))return -EPERM ; - oldflags = fi->i_flags; - -if ((iflags ^ oldflags) & (F2FS_APPEND_FL |F2FS_IMMUTABLE_FL )) -if (!capable (CAP_LINUX_IMMUTABLE )) -return -EPERM ; - - fi->i_flags = iflags | (oldflags & ~mask); + fi->i_flags = iflags | (fi->i_flags & ~mask);if (fi->i_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT );
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Re: [PATCH 3/3] f2fs: remove redundant check from f2fs_setflags_common()
Quoted 7 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Now that
f2fs_ioc_setflags()andf2fs_ioc_fssetxattr()call the VFS helper functions which check for permission to change the immutable and append-only flags, it's no longer needed to do this check inf2fs_setflags_common()too. So remove it.
Quoted 6 lines
This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
Thanks,
Re: [PATCH 3/3] f2fs: remove redundant check from f2fs_setflags_common()
In reply to Eric BiggersQuoted 7 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Now that
f2fs_ioc_setflags()andf2fs_ioc_fssetxattr()call the VFS helper functions which check for permission to change the immutable and append-only flags, it's no longer needed to do this check inf2fs_setflags_common()too. So remove it.
Quoted 6 lines
This is based on a patch from Darrick Wong, but reworked to apply after commit
360985573b55("f2fs: separate f2fsi_flagsfromfs_flagsand ext4i_flags").Originally-from: Darrick J. Wong <[email protected]>
Signed-off-by Eric Biggers <[email protected]>
Looks ok,
--D
Quoted 32 lines
--- fs/f2fs/file.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)fs/f2fs/file.c +1
-8@@ -1648,19 +1648,12 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)static int f2fs_setflags_common (struct inode *inode,u32 iflags,u32 mask) {struct f2fs_inode_info *fi =F2FS_I (inode); -u32 oldflags;/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode))return -EPERM ; - oldflags = fi->i_flags; - -if ((iflags ^ oldflags) & (F2FS_APPEND_FL |F2FS_IMMUTABLE_FL )) -if (!capable (CAP_LINUX_IMMUTABLE )) -return -EPERM ; - - fi->i_flags = iflags | (oldflags & ~mask); + fi->i_flags = iflags | (fi->i_flags & ~mask);if (fi->i_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT );Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel