Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp1153257rwd; Tue, 16 May 2023 12:37:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4gNXoJYs3NFdLGRTDerbNwEXEemyT+9hhnTnlmfZliX0xXoJ3yn5vMyaBXyeg/2K5sQTik X-Received: by 2002:a05:6a20:3d8a:b0:106:4e09:151e with SMTP id s10-20020a056a203d8a00b001064e09151emr9803014pzi.39.1684265822505; Tue, 16 May 2023 12:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684265822; cv=none; d=google.com; s=arc-20160816; b=p2n8OBPoZLNsOowcLHe9MZR58HtO1WPE7ua/ZdVILHxSzsGmbTAmqr7F4Ak8Hol8bJ 5tAdzF914d2xsI+tBPmCjFZcntxzrYM4n5t3TRez+FojmeTUrn6G4oj21bZqHDRvuYK8 mUXm+t+tT8J8dYjI5lcmQgd21RO6MPd8KTFyIFuJnoF+eTtIgJ0MWobibjYL/Nj2odSg 0Ohd/dlP+zjspd6zGgtHsuOnqK+QEGY7TdLSZ7VQbmO9eifUUxis/m9IGG05iZZFKAA9 2tJTVUwkv5qCwUd6wEj/196gJRyiKnGqIfykljcVBpqNIamladVwaClffnWXFDnpw/1D VZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6ZrPYDjwLGlRaReyRClDuqn4qyu9lZUT+0fYgFgPHu0=; b=bAaR3pdW+FWrHGiYOnXnBRW/2F6/Ifm4GnESZgQpkExdktyVMU3U8IrjydFvdwj9Ff U+BBaL8E9QpD4A2Ff/Zn3JYdjvEhaXVvOAEjUcyXdriueiKtdbXMY96UNi8jtTMoxH+f UvfGNh8j1j+2fDUFChXe/sR1A34Yyii+LHXH5chZ0N8a4sLJvP/Rykc7Q4oq/FBbMXTu s4ilXMwlkpVNZhBj42Nngt81hdeTY04N8daXBjb5qCj6L1Gfs2UEqG7iXfRZHxb5j74S aOOHK+XecFk6Fj570ruc9g47ETjIfteSZ8Hk37VKAUpGsM47ehgPy4T8yVujEpcU8t2T rdUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=d9EZO9as; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bm18-20020a656e92000000b0053416d0b54csi5636785pgb.75.2023.05.16.12.36.46; Tue, 16 May 2023 12:37:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=d9EZO9as; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229539AbjEPT11 (ORCPT + 99 others); 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@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) --- 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); -- 2.39.2