@@ -95,9 +95,39 @@ static int ubifs2ioctl(int ubifs_flags)
return ioctl_flags;
}
-static int setflags(struct file *file, int flags)
+/* Transfer xflags flags to internal */
+static inline unsigned long ubifs_xflags_to_iflags(__u32 xflags)
{
- int oldflags, err, release;
+ unsigned long iflags = 0;
+
+ if (xflags & FS_XFLAG_SYNC)
+ iflags |= UBIFS_APPEND_FL;
+ if (xflags & FS_XFLAG_IMMUTABLE)
+ iflags |= UBIFS_IMMUTABLE_FL;
+ if (xflags & FS_XFLAG_APPEND)
+ iflags |= UBIFS_APPEND_FL;
+
+ return iflags;
+}
+
+/* Transfer internal flags to xflags */
+static inline __u32 ubifs_iflags_to_xflags(unsigned long flags)
+{
+ __u32 xflags = 0;
+
+ if (flags & UBIFS_APPEND_FL)
+ xflags |= FS_XFLAG_SYNC;
+ if (flags & UBIFS_IMMUTABLE_FL)
+ xflags |= FS_XFLAG_IMMUTABLE;
+ if (flags & UBIFS_APPEND_FL)
+ xflags |= FS_XFLAG_APPEND;
+
+ return xflags;
+}
+
+static int setflags(struct file *file, int flags, struct fsxattr *fa)
+{
+ int ubi_flags, oldflags, err, release;
struct inode *inode = file_inode(file);
struct ubifs_inode *ui = ubifs_inode(inode);
struct ubifs_info *c = inode->i_sb->s_fs_info;
@@ -110,6 +140,11 @@ static int setflags(struct file *file, int flags)
if (!inode_owner_or_capable(inode))
return -EACCES;
+ if (fa)
+ ubi_flags = ubifs_xflags_to_iflags(fa->fsx_xflags);
+ else
+ ubi_flags = ioctl2ubifs(flags);
+
/*
* Make sure the file-system is read-write and make sure it
* will not become read-only while we are changing the flags.
@@ -126,11 +161,11 @@ static int setflags(struct file *file, int flags)
mutex_lock(&ui->ui_mutex);
oldflags = ubifs2ioctl(ui->flags);
- err = vfs_ioc_setflags_prepare(inode, oldflags, flags);
+ err = vfs_ioc_setflags_prepare(inode, oldflags, ubifs2ioctl(ubi_flags));
if (err)
goto out_unlock;
- ui->flags = ioctl2ubifs(flags);
+ ui->flags = ubi_flags;
ubifs_set_inode_flags(inode);
inode->i_ctime = current_time(inode);
release = ui->dirty;
@@ -156,6 +191,44 @@ static int setflags(struct file *file, int flags)
return err;
}
+static int ubifs_ioc_fsgetxattr(struct file *file, void __user *arg)
+{
+ struct inode *inode = file_inode(file);
+ struct ubifs_inode *ui = ubifs_inode(inode);
+ struct fsxattr fa;
+
+ memset(&fa, 0, sizeof(fa));
+
+ fa.fsx_xflags = ubifs_iflags_to_xflags(ui->flags);
+
+ if (copy_to_user(arg, &fa, sizeof(fa)))
+ return -EFAULT;
+
+ return 0;
+}
+
+static int check_xflags(unsigned int flags)
+{
+ if (flags & ~(FS_XFLAG_SYNC | FS_XFLAG_IMMUTABLE | FS_XFLAG_APPEND))
+ return -EOPNOTSUPP;
+ return 0;
+}
+
+static int ubifs_ioc_fssetxattr(struct file *file, const void __user *arg)
+{
+ struct fsxattr fa = {};
+ int err;
+
+ if (copy_from_user(&fa, (struct fsxattr __user *)arg, sizeof(fa)))
+ return -EFAULT;
+
+ err = check_xflags(fa.fsx_xflags);
+ if (err)
+ return err;
+
+ return setflags(file, 0, &fa);
+}
+
long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int flags, err;
@@ -179,7 +252,7 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
flags &= ~FS_DIRSYNC_FL;
- return setflags(file, flags);
+ return setflags(file, flags, NULL);
}
case FS_IOC_SET_ENCRYPTION_POLICY: {
struct ubifs_info *c = inode->i_sb->s_fs_info;
@@ -208,6 +281,12 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
return fscrypt_ioctl_get_key_status(file, (void __user *)arg);
+ case FS_IOC_FSGETXATTR:
+ return ubifs_ioc_fsgetxattr(file, (void __user *)arg);
+
+ case FS_IOC_FSSETXATTR:
+ return ubifs_ioc_fssetxattr(file, (const void __user *)arg);
+
default:
return -ENOTTY;
}
The FS_IOC_FS[SG]ETXATTR ioctls are an alternative to FS_IOC_[GS]ETFLAGS with additional features. This patch adds support for these ioctls. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- fs/ubifs/ioctl.c | 89 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 5 deletions(-)