From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Biggers Subject: Re: [PATCH V3 8/9] fsverity: Move verity status check to fsverity_file_open Date: Mon, 10 Dec 2018 09:26:11 -0800 Message-ID: <20181210172610.GA92174@gmail.com> References: <20181208065144.19486-1-chandan@linux.vnet.ibm.com> <20181208065144.19486-9-chandan@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1gWPK1-0000lj-81 for linux-f2fs-devel@lists.sourceforge.net; Mon, 10 Dec 2018 17:26:21 +0000 Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1gWPJz-00D7ex-K4 for linux-f2fs-devel@lists.sourceforge.net; Mon, 10 Dec 2018 17:26:21 +0000 Content-Disposition: inline In-Reply-To: <20181208065144.19486-9-chandan@linux.vnet.ibm.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: Chandan Rajendra Cc: linux-mips@linux-mips.org, linux-doc@vger.kernel.org, jhogan@kernel.org, heiko.carstens@de.ibm.com, linux-mtd@lists.infradead.org, deanbo422@gmail.com, linux-s390@vger.kernel.org, corbet@lwn.net, richard@nod.at, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, green.hu@gmail.com, jaegeuk@kernel.org, tytso@mit.edu, dedekind1@gmail.com, adrian.hunter@intel.com, ralf@linux-mips.org, linux-f2fs-devel@lists.sourceforge.net, paul.burton@mips.com, schwidefsky@de.ibm.com, adilger.kernel@dilger.ca, viro@zeniv.linux.org.uk Hi Chandan, On Sat, Dec 08, 2018 at 12:21:43PM +0530, Chandan Rajendra wrote: > Instead of conditionally checking for verity status of an inode before > invoking fsverity_file_open(), this commit moves the check inside the > definition of fsverity_file_open(). > > Signed-off-by: Chandan Rajendra > --- > fs/ext4/file.c | 8 +++----- > fs/f2fs/file.c | 8 +++----- > fs/verity/setup.c | 3 +++ > 3 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/fs/ext4/file.c b/fs/ext4/file.c > index 30fbd663354f..b404a857cd48 100644 > --- a/fs/ext4/file.c > +++ b/fs/ext4/file.c > @@ -444,11 +444,9 @@ static int ext4_file_open(struct inode * inode, struct file * filp) > if (ret) > return ret; > > - if (IS_VERITY(inode)) { > - ret = fsverity_file_open(inode, filp); > - if (ret) > - return ret; > - } > + ret = fsverity_file_open(inode, filp); > + if (ret) > + return ret; > > /* > * Set up the jbd2_inode if we are opening the inode for > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 2eb4821d95d1..925c0d9608da 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -491,11 +491,9 @@ static int f2fs_file_open(struct inode *inode, struct file *filp) > if (err) > return err; > > - if (IS_VERITY(inode)) { > - err = fsverity_file_open(inode, filp); > - if (err) > - return err; > - } > + err = fsverity_file_open(inode, filp); > + if (err) > + return err; > > filp->f_mode |= FMODE_NOWAIT; > > diff --git a/fs/verity/setup.c b/fs/verity/setup.c > index 08b609127531..bc463dc601b1 100644 > --- a/fs/verity/setup.c > +++ b/fs/verity/setup.c > @@ -771,6 +771,9 @@ static int setup_fsverity_info(struct inode *inode) > */ > int fsverity_file_open(struct inode *inode, struct file *filp) > { > + if (!IS_VERITY(inode)) > + return 0; > + > if (filp->f_mode & FMODE_WRITE) { > pr_debug("Denying opening verity file (ino %lu) for write\n", > inode->i_ino); > -- > 2.19.1 > This will break ext4 and f2fs when !CONFIG_FS_VERITY because then: static inline int fsverity_file_open(struct inode *inode, struct file *filp) { return -EOPNOTSUPP; } Can you please make it like fscrypt_file_open()? static inline int fsverity_file_open(struct inode *inode, struct file *filp) { if (IS_VERITY(inode)) return -EOPNOTSUPP; return 0; } Same with fsverity_prepare_setattr(). - Eric