From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-fsdevel@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Jan Kara <jack@suse.com>, Richard Weinberger <richard@nod.at>, kernel@pengutronix.de, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 06/11] ubifs: move checks and preparation into setflags() Date: Wed, 14 Aug 2019 14:18:29 +0200 [thread overview] Message-ID: <20190814121834.13983-7-s.hauer@pengutronix.de> (raw) In-Reply-To: <20190814121834.13983-1-s.hauer@pengutronix.de> setflags() can be reused for upcoming FS_IOC_FS[SG]ETXATTR ioctl support. In preparation for that move the checks and preparation into that function so we can reuse them aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- fs/ubifs/ioctl.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 034ad14710d1..b9c4a51bceea 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -95,18 +95,35 @@ static int ubifs2ioctl(int ubifs_flags) return ioctl_flags; } -static int setflags(struct inode *inode, int flags) +static int setflags(struct file *file, int flags) { int 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; struct ubifs_budget_req req = { .dirtied_ino = 1, .dirtied_ino_d = ui->data_len }; - err = ubifs_budget_space(c, &req); + if (IS_RDONLY(inode)) + return -EROFS; + + if (!inode_owner_or_capable(inode)) + return -EACCES; + + /* + * Make sure the file-system is read-write and make sure it + * will not become read-only while we are changing the flags. + */ + err = mnt_want_write_file(file); if (err) return err; + dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags); + + err = ubifs_budget_space(c, &req); + if (err) + goto out_drop; + mutex_lock(&ui->ui_mutex); oldflags = ubifs2ioctl(ui->flags); err = vfs_ioc_setflags_prepare(inode, oldflags, flags); @@ -124,12 +141,18 @@ static int setflags(struct inode *inode, int flags) ubifs_release_budget(c, &req); if (IS_SYNC(inode)) err = write_inode_now(inode, 1); + + mnt_drop_write_file(file); + return err; out_unlock: ubifs_err(c, "can't modify inode %lu attributes", inode->i_ino); mutex_unlock(&ui->ui_mutex); ubifs_release_budget(c, &req); +out_drop: + mnt_drop_write_file(file); + return err; } @@ -146,12 +169,6 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return put_user(flags, (int __user *) arg); case FS_IOC_SETFLAGS: { - if (IS_RDONLY(inode)) - return -EROFS; - - if (!inode_owner_or_capable(inode)) - return -EACCES; - if (get_user(flags, (int __user *) arg)) return -EFAULT; @@ -161,17 +178,8 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (!S_ISDIR(inode->i_mode)) flags &= ~FS_DIRSYNC_FL; - /* - * Make sure the file-system is read-write and make sure it - * will not become read-only while we are changing the flags. - */ - err = mnt_want_write_file(file); - if (err) - return err; - dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags); - err = setflags(inode, flags); - mnt_drop_write_file(file); - return err; + + return setflags(file, flags); } case FS_IOC_SET_ENCRYPTION_POLICY: { struct ubifs_info *c = inode->i_sb->s_fs_info; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-fsdevel@vger.kernel.org Cc: Richard Weinberger <richard@nod.at>, Sascha Hauer <s.hauer@pengutronix.de>, linux-mtd@lists.infradead.org, kernel@pengutronix.de, Jan Kara <jack@suse.com> Subject: [PATCH 06/11] ubifs: move checks and preparation into setflags() Date: Wed, 14 Aug 2019 14:18:29 +0200 [thread overview] Message-ID: <20190814121834.13983-7-s.hauer@pengutronix.de> (raw) In-Reply-To: <20190814121834.13983-1-s.hauer@pengutronix.de> setflags() can be reused for upcoming FS_IOC_FS[SG]ETXATTR ioctl support. In preparation for that move the checks and preparation into that function so we can reuse them aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- fs/ubifs/ioctl.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 034ad14710d1..b9c4a51bceea 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -95,18 +95,35 @@ static int ubifs2ioctl(int ubifs_flags) return ioctl_flags; } -static int setflags(struct inode *inode, int flags) +static int setflags(struct file *file, int flags) { int 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; struct ubifs_budget_req req = { .dirtied_ino = 1, .dirtied_ino_d = ui->data_len }; - err = ubifs_budget_space(c, &req); + if (IS_RDONLY(inode)) + return -EROFS; + + if (!inode_owner_or_capable(inode)) + return -EACCES; + + /* + * Make sure the file-system is read-write and make sure it + * will not become read-only while we are changing the flags. + */ + err = mnt_want_write_file(file); if (err) return err; + dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags); + + err = ubifs_budget_space(c, &req); + if (err) + goto out_drop; + mutex_lock(&ui->ui_mutex); oldflags = ubifs2ioctl(ui->flags); err = vfs_ioc_setflags_prepare(inode, oldflags, flags); @@ -124,12 +141,18 @@ static int setflags(struct inode *inode, int flags) ubifs_release_budget(c, &req); if (IS_SYNC(inode)) err = write_inode_now(inode, 1); + + mnt_drop_write_file(file); + return err; out_unlock: ubifs_err(c, "can't modify inode %lu attributes", inode->i_ino); mutex_unlock(&ui->ui_mutex); ubifs_release_budget(c, &req); +out_drop: + mnt_drop_write_file(file); + return err; } @@ -146,12 +169,6 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return put_user(flags, (int __user *) arg); case FS_IOC_SETFLAGS: { - if (IS_RDONLY(inode)) - return -EROFS; - - if (!inode_owner_or_capable(inode)) - return -EACCES; - if (get_user(flags, (int __user *) arg)) return -EFAULT; @@ -161,17 +178,8 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (!S_ISDIR(inode->i_mode)) flags &= ~FS_DIRSYNC_FL; - /* - * Make sure the file-system is read-write and make sure it - * will not become read-only while we are changing the flags. - */ - err = mnt_want_write_file(file); - if (err) - return err; - dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags); - err = setflags(inode, flags); - mnt_drop_write_file(file); - return err; + + return setflags(file, flags); } case FS_IOC_SET_ENCRYPTION_POLICY: { struct ubifs_info *c = inode->i_sb->s_fs_info; -- 2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-08-14 12:19 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-14 12:18 [PATCH 00/11] Add quota support to UBIFS Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 01/11] quota: Make inode optional Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 02/11] quota: Only module_put the format when existing Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-15 11:18 ` Jan Kara 2019-08-15 11:18 ` Jan Kara 2019-08-16 11:49 ` Sascha Hauer 2019-08-16 11:49 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 03/11] fs: move __get_super() out of loop Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 23:32 ` Al Viro 2019-08-14 23:32 ` Al Viro 2019-08-14 12:18 ` [PATCH 04/11] fs, quota: introduce wait_super_thawed() to wait until a superblock is thawed Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 23:35 ` Al Viro 2019-08-14 23:35 ` Al Viro 2019-08-14 12:18 ` [PATCH 05/11] quota: Allow to pass quotactl a mountpoint Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 22:42 ` kbuild test robot 2019-08-14 22:42 ` kbuild test robot 2019-08-14 23:33 ` kbuild test robot 2019-08-14 23:33 ` kbuild test robot 2019-08-14 23:36 ` Al Viro 2019-08-14 23:36 ` Al Viro 2019-08-14 23:39 ` Al Viro 2019-08-14 23:39 ` Al Viro 2019-08-14 23:51 ` Al Viro 2019-08-14 23:51 ` Al Viro 2019-08-15 9:53 ` Jan Kara 2019-08-15 9:53 ` Jan Kara 2019-08-15 7:46 ` Sascha Hauer 2019-08-15 7:46 ` Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer [this message] 2019-08-14 12:18 ` [PATCH 06/11] ubifs: move checks and preparation into setflags() Sascha Hauer 2019-08-14 12:18 ` [PATCH 07/11] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 14:11 ` Mainz, Roland 2019-08-14 14:11 ` Mainz, Roland 2019-08-15 7:31 ` Sascha Hauer 2019-08-15 7:31 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 08/11] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 09/11] ubifs: Add support for project id Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 10/11] ubifs: export get_znode Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-14 12:18 ` [PATCH 11/11] ubifs: Add quota support Sascha Hauer 2019-08-14 12:18 ` Sascha Hauer 2019-08-15 11:17 ` Jan Kara 2019-08-15 11:17 ` Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190814121834.13983-7-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=jack@suse.com \ --cc=kernel@pengutronix.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=richard@nod.at \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.