From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-doc@vger.kernel.org, linux-mips@linux-mips.org,
linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-fsdevel@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
tytso@mit.edu, adilger.kernel@dilger.ca, ebiggers@kernel.org,
jaegeuk@kernel.org, yuchao0@huawei.com, corbet@lwn.net,
ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org,
green.hu@gmail.com, deanbo422@gmail.com, schwidefsky@de.ibm.com,
heiko.carstens@de.ibm.com, richard@nod.at, dedekind1@gmail.com,
adrian.hunter@intel.com, viro@zeniv.linux.org.uk
Subject: [PATCH V4 9/9] fsverity: Move verity status check to fsverity_prepare_setattr
Date: Wed, 12 Dec 2018 09:37:36 +0530 [thread overview]
Message-ID: <20181212040736.2849-10-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20181212040736.2849-1-chandan@linux.vnet.ibm.com>
Instead of conditionally checking for verity status of an inode before
invoking fsverity_prepare_setattr(), this commit moves the check inside the
definition of fsverity_prepare_setattr().
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
fs/ext4/inode.c | 8 +++-----
fs/f2fs/file.c | 8 +++-----
fs/verity/setup.c | 2 +-
include/linux/fsverity.h | 5 ++++-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 703f55635824..44561e68886b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5510,11 +5510,9 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
if (error)
return error;
- if (IS_VERITY(inode)) {
- error = fsverity_prepare_setattr(dentry, attr);
- if (error)
- return error;
- }
+ error = fsverity_prepare_setattr(dentry, attr);
+ if (error)
+ return error;
if (is_quota_modification(inode, attr)) {
error = dquot_initialize(inode);
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 925c0d9608da..422907ca37c6 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -798,11 +798,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
if (err)
return err;
- if (IS_VERITY(inode)) {
- err = fsverity_prepare_setattr(dentry, attr);
- if (err)
- return err;
- }
+ err = fsverity_prepare_setattr(dentry, attr);
+ if (err)
+ return err;
if (is_quota_modification(inode, attr)) {
err = dquot_initialize(inode);
diff --git a/fs/verity/setup.c b/fs/verity/setup.c
index bc463dc601b1..154556d72691 100644
--- a/fs/verity/setup.c
+++ b/fs/verity/setup.c
@@ -796,7 +796,7 @@ EXPORT_SYMBOL_GPL(fsverity_file_open);
*/
int fsverity_prepare_setattr(struct dentry *dentry, struct iattr *attr)
{
- if (attr->ia_valid & ATTR_SIZE) {
+ if (IS_VERITY(d_inode(dentry)) && (attr->ia_valid & ATTR_SIZE)) {
pr_debug("Denying truncate of verity file (ino %lu)\n",
d_inode(dentry)->i_ino);
return -EPERM;
diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h
index c770025606e1..9ccc8ad9652a 100644
--- a/include/linux/fsverity.h
+++ b/include/linux/fsverity.h
@@ -69,7 +69,10 @@ static inline int fsverity_file_open(struct inode *inode, struct file *filp)
static inline int fsverity_prepare_setattr(struct dentry *dentry,
struct iattr *attr)
{
- return -EOPNOTSUPP;
+ if (IS_VERITY(d_inode(dentry)))
+ return -EOPNOTSUPP;
+
+ return 0;
}
static inline int fsverity_prepare_getattr(struct inode *inode)
--
2.19.1
prev parent reply other threads:[~2018-12-12 4:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 4:07 [PATCH V4 0/9] Remove fs specific fscrypt and fsverity build config options Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 1/9] ext4: use IS_ENCRYPTED() to check encryption status Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 2/9] f2fs: " Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 3/9] fscrypt: remove filesystem specific build config option Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 4/9] Add S_VERITY and IS_VERITY() Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 5/9] ext4: use IS_VERITY() to check inode's fsverity status Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 6/9] f2fs: " Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 7/9] fsverity: Remove filesystem specific build config option Chandan Rajendra
2018-12-12 4:07 ` [PATCH V4 8/9] fsverity: Move verity status check to fsverity_file_open Chandan Rajendra
2018-12-12 4:07 ` Chandan Rajendra [this message]
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=20181212040736.2849-10-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=adrian.hunter@intel.com \
--cc=corbet@lwn.net \
--cc=deanbo422@gmail.com \
--cc=dedekind1@gmail.com \
--cc=ebiggers@kernel.org \
--cc=green.hu@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jaegeuk@kernel.org \
--cc=jhogan@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=richard@nod.at \
--cc=schwidefsky@de.ibm.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=yuchao0@huawei.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).