diff mbox series

[6/5] ext4: Call fsverity_verify_folio()

Message ID 20230516192713.1070469-1-willy@infradead.org (mailing list archive)
State New, archived
Headers show
Series ext4: misc left over folio changes | expand

Commit Message

Matthew Wilcox (Oracle) May 16, 2023, 7:27 p.m. UTC
Now that fsverity supports working on entire folios, call
fsverity_verify_folio() instead of fsverity_verify_page()

Reported-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/ext4/readpage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ritesh Harjani (IBM) May 17, 2023, 6:45 a.m. UTC | #1
"Matthew Wilcox (Oracle)" <willy@infradead.org> writes:

> Now that fsverity supports working on entire folios, call
> fsverity_verify_folio() instead of fsverity_verify_page()

Thanks for catching it.

>
> Reported-by: Eric Biggers <ebiggers@kernel.org>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>  fs/ext4/readpage.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I agree that we could use fsverity_verify_folio() instead of
fsverity_verify_page() here.

Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>


>
> 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
Eric Biggers May 20, 2023, 1:06 a.m. UTC | #2
On Tue, May 16, 2023 at 08:27:13PM +0100, Matthew Wilcox (Oracle) wrote:
> Now that fsverity supports working on entire folios, call
> fsverity_verify_folio() instead of fsverity_verify_page()
> 
> Reported-by: Eric Biggers <ebiggers@kernel.org>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>  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);
> -- 

Reviewed-by: Eric Biggers <ebiggers@google.com>

(Though I must mention that doing weird things like "PATCH 6/5" makes life hard
for scripts that operate on patch series...)

- Eric
diff mbox series

Patch

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);