From patchwork Tue May 16 19:27:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13243568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF99CC77B7A for ; Tue, 16 May 2023 19:27:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229607AbjEPT11 (ORCPT ); Tue, 16 May 2023 15:27:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjEPT10 (ORCPT ); Tue, 16 May 2023 15:27:26 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B46F935AD; Tue, 16 May 2023 12:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=6ZrPYDjwLGlRaReyRClDuqn4qyu9lZUT+0fYgFgPHu0=; b=d9EZO9asjupb3jlC/brALJtbtQ 0uTLJKKO/MBmoyBlZFNzPjU5vpkp7nzh0TEEqF8F96GaTWqQXGVFWeILRLRtOHx3EDHY0fz4kjZl2 zEyXiWoTA4L/JsClBdSg3fWJgxokSlu/olWCz90JAL+BtFW3tiB3nVC4HLP/UCmAhlgpQ+p7tOWfA VOPYmYFPO7v7Ffd4UBuraYVz+UOixrLKtwq2D8LLBvZPx01ZWc4QQkDrwojm2TwfuKxWW+rJcdUPR 0MxfVjh2P7DlyXqomzBQ8swQAdBZBcq759vVD/RjAsvztddgSxdioiksfUnKA/8Mqvy0JnZPHOqi7 w60ndHdw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pz0KR-004UVv-7Y; Tue, 16 May 2023 19:27:23 +0000 From: "Matthew Wilcox (Oracle)" To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, Ojaswin Mujoo , Disha Goel , "Ritesh Harjani (IBM)" Cc: "Matthew Wilcox (Oracle)" , Eric Biggers Subject: [PATCH 6/5] ext4: Call fsverity_verify_folio() Date: Tue, 16 May 2023 20:27:13 +0100 Message-Id: <20230516192713.1070469-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Now that fsverity supports working on entire folios, call fsverity_verify_folio() instead of fsverity_verify_page() Reported-by: Eric Biggers Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Ritesh Harjani (IBM) Reviewed-by: Eric Biggers --- fs/ext4/readpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index 6f46823fba61..3e7d160f543f 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -334,7 +334,7 @@ int ext4_mpage_readpages(struct inode *inode, folio_size(folio)); if (first_hole == 0) { if (ext4_need_verity(inode, folio->index) && - !fsverity_verify_page(&folio->page)) + !fsverity_verify_folio(folio)) goto set_error_page; folio_mark_uptodate(folio); folio_unlock(folio);