From patchwork Fri Mar 5 19:26:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Burkov X-Patchwork-Id: 12119401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2603AC4332E for ; Fri, 5 Mar 2021 19:27:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07624650B0 for ; Fri, 5 Mar 2021 19:27:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbhCET1T (ORCPT ); Fri, 5 Mar 2021 14:27:19 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:53397 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbhCET0u (ORCPT ); Fri, 5 Mar 2021 14:26:50 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id A48D72B0E; Fri, 5 Mar 2021 14:26:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 05 Mar 2021 14:26:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bur.io; h=from :to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=fm3; bh=XbinyDEAT9G7Ltz/6B0Kj/lXpL DS2Shro9+tdT6xF5I=; b=KLWj+gekLzQSFXug1/6sPN8ryxSosZUc368LXQRUHL P3WjzXYLqSYLQEJMq8liuLAazVRSV8e5XfrpF65TaiA+okxDSVlXbVgNMMDCGY3Y ij8iHGTAOOmMn0Zhlj44/+1TzhjFoQRv8YgdGUeOVOekNjizzCRTy1/qc+WMAyhA HSDyGN0W5DG35T9UWrAdoKSgXVHxLYw+xS9y/iyBnHGnJyI++yO0JyY/RRN+cN1q zy+PTeFMddz4NTGG6oUCD7HZ3xYQLyWFMXRmpFTVn+EXyxJ7vZlutH8O8ABUEAoP UMTds1m/aAoBkeFmFdKqxGnFMd0jqTIb7qUu0mv51lww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=XbinyDEAT9G7Ltz/6B0Kj/lXpLDS2Shro9+tdT6xF5I=; b=n/V7fRHi mejTcldxcub7KdsxyyxHjWGfs1TjF9T2nBGA1RMDKkFfm1fgGQ0YzmBLsxBxa2Ft +oX8spPZGtG5G4Ko0u9B/v+CC5agNzyQoUze3KMG7q1o6VT6iyuujmvsV9/60x6e NujdVIj8oP1VucCX5Ic5O0SJXad0E6gVrAksdl7ztPEUphifSQhSuRNHCyOuL0t8 FXFpxvGXwX3LQVFS1WHU8t4ySGyar0dPj6McC/hkxkAWJT+9xLxcqDps62LWpzyh ie/9sBa6oDqf/89zNA+wd5EYnC0NONxnGcC0sM9JaclvsqCOgN2s1z78jLzKcidI 6oDvQDFr4gl9BA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddtiedguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepuehorhhi shcuuehurhhkohhvuceosghorhhishessghurhdrihhoqeenucggtffrrghtthgvrhhnpe eiueffuedvieeujefhheeigfekvedujeejjeffvedvhedtudefiefhkeegueehleenucfk phepudeifedruddugedrudefvddrheenucevlhhushhtvghrufhiiigvpeefnecurfgrrh grmhepmhgrihhlfhhrohhmpegsohhrihhssegsuhhrrdhioh X-ME-Proxy: Received: from localhost (unknown [163.114.132.5]) by mail.messagingengine.com (Postfix) with ESMTPA id CBD16108005F; Fri, 5 Mar 2021 14:26:48 -0500 (EST) From: Boris Burkov To: linux-btrfs@vger.kernel.org, kernel-team@fb.com, linux-fscrypt@vger.kernel.org, 'Eric Biggers ' Subject: [PATCH v2 4/5] btrfs: fallback to buffered io for verity files Date: Fri, 5 Mar 2021 11:26:32 -0800 Message-Id: <518322d5993f6eea18d5c4ee0cdaaa97fed9a405.1614971203.git.boris@bur.io> X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Reading the contents with direct IO would circumvent verity checks, so fallback to buffered reads. For what it's worth, this is how ext4 handles it as well. Signed-off-by: Boris Burkov --- fs/btrfs/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 75f1406021e5..c948c30e132c 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -3623,6 +3623,9 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to) struct inode *inode = file_inode(iocb->ki_filp); ssize_t ret; + if (fsverity_active(inode)) + return 0; + if (check_direct_read(btrfs_sb(inode->i_sb), to, iocb->ki_pos)) return 0;