Commit 5779aa2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt 

Pull fsverity updates from Eric Biggers:
 "Minor changes to convert uses of kmap() to kmap_local_page()"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fs-verity: use kmap_local_page() instead of kmap()
  fs-verity: use memcpy_from_page()
parents 438b2cdd 8377e8a2

fs/verity/read_metadata.c

+3 −3
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ static int fsverity_read_merkle_tree(struct inode *inode, 
			break;

		}



		virt = kmap(page);

		virt = kmap_local_page(page);

		if (copy_to_user(buf, virt + offs_in_page, bytes_to_copy)) {

			kunmap(page);

			kunmap_local(virt);

			put_page(page);

			err = -EFAULT;

			break;

		}

		kunmap(page);

		kunmap_local(virt);

		put_page(page);



		retval += bytes_to_copy;

fs/verity/verify.c

+2 −12
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ static void hash_at_level(const struct merkle_tree_params *params, 
		   (params->log_blocksize - params->log_arity);

}



/* Extract a hash from a hash page */

static void extract_hash(struct page *hpage, unsigned int hoffset,

			 unsigned int hsize, u8 *out)

{

	void *virt = kmap_atomic(hpage);



	memcpy(out, virt + hoffset, hsize);

	kunmap_atomic(virt);

}



static inline int cmp_hashes(const struct fsverity_info *vi,

			     const u8 *want_hash, const u8 *real_hash,

			     pgoff_t index, int level)
@@ -129,7 +119,7 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, 
		}



		if (PageChecked(hpage)) {

			extract_hash(hpage, hoffset, hsize, _want_hash);

			memcpy_from_page(_want_hash, hpage, hoffset, hsize);

			want_hash = _want_hash;

			put_page(hpage);

			pr_debug_ratelimited("Hash page already checked, want %s:%*phN\n",
@@ -158,7 +148,7 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, 
		if (err)

			goto out;

		SetPageChecked(hpage);

		extract_hash(hpage, hoffset, hsize, _want_hash);

		memcpy_from_page(_want_hash, hpage, hoffset, hsize);

		want_hash = _want_hash;

		put_page(hpage);

		pr_debug("Verified hash page at level %d, now want %s:%*phN\n",