diff options
| author | Hou Tao <houtao1@huawei.com> | 2019-02-09 16:54:20 +0800 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2019-02-24 11:40:46 +0100 |
| commit | 2fe8b2d5578d7d142982e3bf62e4c0caf8b8fe02 (patch) | |
| tree | 5c0cc1ed6256c83c01dabbec7b2a75fc4148c191 /fs/ubifs | |
| parent | 663586c0a8929db81e617c775823efb9d65f2bc2 (diff) | |
| download | blackbird-op-linux-2fe8b2d5578d7d142982e3bf62e4c0caf8b8fe02.tar.gz blackbird-op-linux-2fe8b2d5578d7d142982e3bf62e4c0caf8b8fe02.zip | |
ubifs: Reject unsupported ioctl flags explicitly
Reject unsupported ioctl flags explicitly, so the following command
on a regular ubifs file will fail:
chattr +d ubifs_file
And xfstests generic/424 will pass.
Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/ioctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 0164bcc827f8..daf9f93e15de 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -28,6 +28,11 @@ #include <linux/mount.h> #include "ubifs.h" +/* Need to be kept consistent with checked flags in ioctl2ubifs() */ +#define UBIFS_SUPPORTED_IOCTL_FLAGS \ + (FS_COMPR_FL | FS_SYNC_FL | FS_APPEND_FL | \ + FS_IMMUTABLE_FL | FS_DIRSYNC_FL) + /** * ubifs_set_inode_flags - set VFS inode flags. * @inode: VFS inode to set flags for @@ -169,6 +174,9 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (get_user(flags, (int __user *) arg)) return -EFAULT; + if (flags & ~UBIFS_SUPPORTED_IOCTL_FLAGS) + return -EOPNOTSUPP; + if (!S_ISDIR(inode->i_mode)) flags &= ~FS_DIRSYNC_FL; |
