From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 426A7C00140 for ; Thu, 18 Aug 2022 23:15:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E9918D0003; Thu, 18 Aug 2022 19:15:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 798768D0002; Thu, 18 Aug 2022 19:15:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 661C58D0003; Thu, 18 Aug 2022 19:15:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5795E8D0002 for ; Thu, 18 Aug 2022 19:15:58 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3767E1C1372 for ; Thu, 18 Aug 2022 23:15:58 +0000 (UTC) X-FDA: 79814273196.21.F52936F Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf31.hostedemail.com (Postfix) with ESMTP id BB4352271B for ; Thu, 18 Aug 2022 23:04:40 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 41FCDB82413; Thu, 18 Aug 2022 22:39:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF3B2C433D6; Thu, 18 Aug 2022 22:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660862398; bh=XhG5VJKg0K2Zsgy7igKZ4ZFLyQCgKURq1heQn+uTGhE=; h=From:To:Cc:Subject:Date:From; b=BqjHITUQAztJfrjxBMbnMfwBZcHgtC2xl3x3pGOD4+n7pwiHuPVeDIugDFFVUujpk aeuqIu3s4/VkmkHcRdSdJUIxmn+3hzlP6nF3IREyjgnpfp++SCWbkVOHBiZ5Fl4cIt rTx+nUtGfHDlUWvnLiDn/fB0dbWgmzHAOzKeOgZdFVKoMz32ix8EXdxuKKF0XN7La+ fwslOgBCzF5RxsQhQlHGzIC5GHuHky66qiP74x6Y378QcfAko1KdOwo8MnWEivtWat KFuwfHJmiS5UX9JnLv/X6HrTlKTKTCuG35g4lb6hDu0ypL3Hz1bDeiESFJf1eqwTDj jydi0AcOBS3Gw== From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, "Fabio M . De Francesco" Subject: [PATCH] fs-verity: use memcpy_from_page() Date: Thu, 18 Aug 2022 15:39:03 -0700 Message-Id: <20220818223903.43710-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660863882; a=rsa-sha256; cv=none; b=1Y0IUVVAwX44N62E2lkuzeVitG65RAxzZu4I7gNb/uQhfWBAvJ4E0i407TvaEBGDkztIx8 GZyR4BOIR32nCmzL7MvM9ZmU+9ww/d4bszSKeTfGs/9Scz4/Olg5saSeJbQqlTi30X/Bfx DslN+rRHX4qHTMlHMxT21PczZ2nK478= ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BqjHITUQ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf31.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660863881; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=vnF0VNpAYy9edVM0Uc1+Fc2uS7KAxWbayf6Zg9jc7wY=; b=JVPRkw94hGw+wkBS0AWRk1K+xxB7oXiLuXs9M21xv0CDoOAV2Ev8t2VkNaWnkgyB8wxa2E T0zOC9ivijRk9pe3jrvhgAOC3AFygJGNLlGvCVh/ja9qa9yDKDLqQQZBwWPNK1YL9pn9Db eo/6qHzZNgmVeBNnF6IeROtwKj51q58= X-Stat-Signature: ekw9exc18of3dsybxabdusuwgrg6fieh X-Rspamd-Queue-Id: BB4352271B Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BqjHITUQ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf31.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org X-Rspamd-Server: rspam04 X-Rspam-User: X-HE-Tag: 1660863880-577765 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Eric Biggers Replace extract_hash() with the memcpy_from_page() helper function. This is simpler, and it has the side effect of replacing the use of kmap_atomic() with its recommended replacement kmap_local_page(). Signed-off-by: Eric Biggers --- fs/verity/verify.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/verity/verify.c b/fs/verity/verify.c index 14e2fb49cff561..bde8c9b7d25f64 100644 --- a/fs/verity/verify.c +++ b/fs/verity/verify.c @@ -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", base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 -- 2.37.1