From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3BC81F16B; Sat, 17 Oct 2026 17:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792256864; cv=none; b=RnIoUB652JJ8HCOaGbybt8wcAjfg2zAwJGSDiJbFibZsaCFmig26G7On55DFUoUDoGpyNz6etafOfrCWZVqzGSkfyNqUfXvod4hXmPZ940mFL7ts+ZCMjZ9p9OS8SUi2bdGrjV4ksYPynmsdtXvdE+O2ClQ+8pdKLy5Cg+BZfTk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792256864; c=relaxed/simple; bh=Up1B89/2ZRmoUwT/vY7Nm7T24a49kfkmy5EStiLycao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tSksbsCyGWMDThuoRdUEpVDRPizUT6V5vreMWtm7slc9mk0s43tauxg3E/irNyxH9Ow3TKK/UVC8CiFpbD6M2nbdv/uWO7I/9LMg7fcrw3ZwmahD5SZTOAgciPPtrFvRbHyY4CIZFRXkHTzh34L6jywi+dgS6aneZMTo3VkRGhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QxBpEe4h; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QxBpEe4h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA6481F000C4; Sat, 17 Oct 2026 17:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792256863; bh=3etzgQJTXleZW/rKoeMvEtBbWF3fnhhQ2anu/0x3Nc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QxBpEe4hA5rsOOUg/VakC27arVNfoyXp1PIIOjmHYIuC4Q3SiueSA+YJw9RHWAhwF C2TJGTJFLkekHn9wSgn5PuL8dxy85J8n8SNvgsi9CLEcoIFbRH2Y1Ymu0oNm3ZWfu3 Ih9Pl6uOTU53waLQS/RHcFRL/KLlrafeZxpbDRwI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Jan Kara , "Darrick J. Wong" , Eric Biggers , Sasha Levin Subject: [PATCH 6.6 0375/1674] fs,fsverity: reject size changes on fsverity files in setattr_prepare Date: Sat, 17 Oct 2026 17:44:07 +0200 Message-ID: <20261017160440.740158974@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261017160431.119607952@linuxfoundation.org> References: <20261017160431.119607952@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig commit e9734653c523c744f03333ece6ae7a315187f05c upstream. Add the check to reject truncates of fsverity files directly to setattr_prepare instead of requiring the file system to handle it. Besides removing boilerplate code, this also fixes the complete lack of such check in btrfs. Fixes: 146054090b08 ("btrfs: initial fsverity support") Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Reviewed-by: "Darrick J. Wong" Link: https://lore.kernel.org/r/20260128152630.627409-2-hch@lst.de Signed-off-by: Eric Biggers Signed-off-by: Sasha Levin --- fs/attr.c | 12 +++++++++++- fs/ext4/inode.c | 4 ---- fs/f2fs/file.c | 4 ---- fs/verity/open.c | 8 -------- include/linux/fsverity.h | 25 ------------------------- 5 files changed, 11 insertions(+), 42 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index a8ae5f6d9b167..c2302fc4b3330 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -173,7 +173,17 @@ int setattr_prepare(struct mnt_idmap *idmap, struct dentry *dentry, * ATTR_FORCE. */ if (ia_valid & ATTR_SIZE) { - int error = inode_newsize_ok(inode, attr->ia_size); + int error; + + /* + * Verity files are immutable, so deny truncates. This isn't + * covered by the open-time check because sys_truncate() takes a + * path, not an open file. + */ + if (IS_ENABLED(CONFIG_FS_VERITY) && IS_VERITY(inode)) + return -EPERM; + + error = inode_newsize_ok(inode, attr->ia_size); if (error) return error; } diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index dea6d27e50288..9ff2958509edc 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5484,10 +5484,6 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if (error) return error; - error = fsverity_prepare_setattr(dentry, attr); - if (error) - return error; - if (is_quota_modification(idmap, inode, attr)) { error = dquot_initialize(inode); if (error) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 038de37ce8c2f..793b4c89a9df5 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1065,10 +1065,6 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if (err) return err; - err = fsverity_prepare_setattr(dentry, attr); - if (err) - return err; - if (unlikely(IS_IMMUTABLE(inode))) return -EPERM; diff --git a/fs/verity/open.c b/fs/verity/open.c index 6c31a871b84bc..5342a8e1f781d 100644 --- a/fs/verity/open.c +++ b/fs/verity/open.c @@ -393,14 +393,6 @@ int __fsverity_file_open(struct inode *inode, struct file *filp) } EXPORT_SYMBOL_GPL(__fsverity_file_open); -int __fsverity_prepare_setattr(struct dentry *dentry, struct iattr *attr) -{ - if (attr->ia_valid & ATTR_SIZE) - return -EPERM; - return 0; -} -EXPORT_SYMBOL_GPL(__fsverity_prepare_setattr); - void __fsverity_cleanup_inode(struct inode *inode) { fsverity_free_info(inode->i_verity_info); diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h index 1eb7eae580be7..139a6f5c62171 100644 --- a/include/linux/fsverity.h +++ b/include/linux/fsverity.h @@ -149,7 +149,6 @@ int fsverity_get_digest(struct inode *inode, /* open.c */ int __fsverity_file_open(struct inode *inode, struct file *filp); -int __fsverity_prepare_setattr(struct dentry *dentry, struct iattr *attr); void __fsverity_cleanup_inode(struct inode *inode); /** @@ -214,12 +213,6 @@ static inline int __fsverity_file_open(struct inode *inode, struct file *filp) return -EOPNOTSUPP; } -static inline int __fsverity_prepare_setattr(struct dentry *dentry, - struct iattr *attr) -{ - return -EOPNOTSUPP; -} - static inline void fsverity_cleanup_inode(struct inode *inode) { } @@ -301,22 +294,4 @@ static inline int fsverity_file_open(struct inode *inode, struct file *filp) return 0; } -/** - * fsverity_prepare_setattr() - prepare to change a verity inode's attributes - * @dentry: dentry through which the inode is being changed - * @attr: attributes to change - * - * Verity files are immutable, so deny truncates. This isn't covered by the - * open-time check because sys_truncate() takes a path, not a file descriptor. - * - * Return: 0 on success, -errno on failure - */ -static inline int fsverity_prepare_setattr(struct dentry *dentry, - struct iattr *attr) -{ - if (IS_VERITY(d_inode(dentry))) - return __fsverity_prepare_setattr(dentry, attr); - return 0; -} - #endif /* _LINUX_FSVERITY_H */ -- 2.53.0