From patchwork Tue Apr 25 06:27:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 87256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3211754vqo; Mon, 24 Apr 2023 23:47:57 -0700 (PDT) X-Google-Smtp-Source: AKy350ZxHaO6NHOEepCZPcD3lRl0ME3JpfyPjYXNSOLbQzrfKBYezehWGhl9sFCdaK6WpVDPusEi X-Received: by 2002:a05:6a20:428e:b0:f2:bb0:4622 with SMTP id o14-20020a056a20428e00b000f20bb04622mr17568880pzj.12.1682405276798; Mon, 24 Apr 2023 23:47:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682405276; cv=none; d=google.com; s=arc-20160816; b=O44YQKs0v8KgP1mUmeAEiy9xs3bTJ2wPyBf6WvFbXftEvCjeFJKxjG2FhOKaK07mT0 4lNMX1D1eldP54qjBxnHBz18bZtTP4ou+keTK6Le/cVVgBc5ju7r7Mi5JS9fqXJ5WlcK z5Z8UOeRsDHi/euuv9BHaS0SIB3ipQ+3i864AcWKwRitY9iEHUzvFeq+ArjuYax3R1I6 GkPNFXosOXrzmvWF/qz5kY3eE3DOPfuJ7tuAAaQmqvW1K/uX5BN4rw/FxPpdmmlTmELZ vJiMwtWs2M9SASFJihj53hL96JFzM4FhLUETCArr/4qOOloC8pIeTOuMTnNC3m0ZuDgf Aibg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=ZkA+iESw9WJ+vOo2SSlmMcqWJffIHPiBlgbEDpG8AQQ=; b=ltQW9C3TN+7dr0HwV3xV/JpgAJiBh3xtmkN114LVQRemMFQH6/nsBE0UdlHSGIhoa8 Po+FCqo7UiYvKL6g4YvW0JvamNIfMPLVyyOui9reggEV3UgQ/cKam3P7fxB6sd7K1kyn gYONznYKGZP81TIn072RClAlnXLMoCmInPTHXlm18F/cLLWsnCILZ9NxiQogqj7oSJUy Z0kj4vPzz1QMh5ZVcBMQsV0wGYDAX7/zAYK9aUTcWxv3kahREjL++wdMM+iQtQEGXGeb WACMRY0aS7g3HGX9lPKNMbCcWr9Sx4bwNn4PPtHNaQnJt7bYOz6NuUv+3ndQ4BcWUVUL fH5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Zxug7M7t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r7-20020a632047000000b0051b35cb52b2si12355583pgm.565.2023.04.24.23.47.40; Mon, 24 Apr 2023 23:47:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=Zxug7M7t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233438AbjDYG1Q (ORCPT + 99 others); Tue, 25 Apr 2023 02:27:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233425AbjDYG1L (ORCPT ); Tue, 25 Apr 2023 02:27:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B103BBA4; Mon, 24 Apr 2023 23:27:10 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id DCFA862BA1; Tue, 25 Apr 2023 06:27:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F98DC433D2; Tue, 25 Apr 2023 06:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682404029; bh=nka1gA7XSDpO0YbpJJARB0ceyBmqTwmWDgxGdXCigbs=; h=Date:From:To:Cc:Subject:From; b=Zxug7M7tFcCpGQ+9bAnra1GCaDwr0bv4tj04hqBlXBeXSgIy2OyLX9dkdNaDgYeD1 HoJYu7ixXaOyxsN+gejA7w8uMNckAg+p9/RMVm5KUyNNxMDqgXtv1JboFPZ/nuOBMb 3FkiX3o8fZJc7uoVTpQea+rqTOPfCYHGIEIhvQzxl5rl7h+Rhxgy7hSVWRPBhud8TH +57dLxz66nOSFtUNx+80lQMatXlAdDpwKJB/ZhkWSdvNqnRuQZ43OBLJKRQ3B656pf U2W8b7Por/4G3Hx7eBtFbI2mLof6DpADKIh39QgcPpX2gNwjmrTE0K9IqjAibiPnGx RyY0FRgO5ySig== Date: Mon, 24 Apr 2023 23:27:07 -0700 From: Eric Biggers To: Linus Torvalds Cc: fsverity@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Theodore Ts'o Subject: [GIT PULL] fsverity updates for 6.4 Message-ID: <20230425062707.GB77408@sol.localdomain> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764129795803652167?= X-GMAIL-MSGID: =?utf-8?q?1764129795803652167?= The following changes since commit 197b6b60ae7bc51dd0814953c562833143b292aa: Linux 6.3-rc4 (2023-03-26 14:40:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/fs/fsverity/linux.git tags/fsverity-for-linus for you to fetch changes up to 04839139213cf60d4c5fc792214a08830e294ff8: fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds (2023-04-11 19:23:23 -0700) ---------------------------------------------------------------- Several cleanups and fixes for fs/verity/, including a couple minor fixes to the changes in 6.3 that added support for Merkle tree block sizes less than the page size. ---------------------------------------------------------------- Eric Biggers (4): fs/buffer.c: use b_folio for fsverity work fsverity: use WARN_ON_ONCE instead of WARN_ON fsverity: explicitly check for buffer overflow in build_merkle_tree() fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds Luis Chamberlain (1): fs-verity: simplify sysctls with register_sysctl() fs/buffer.c | 9 ++++----- fs/verity/enable.c | 21 +++++++++++++++++++-- fs/verity/hash_algs.c | 4 ++-- fs/verity/open.c | 2 +- fs/verity/signature.c | 9 +-------- include/linux/fsverity.h | 6 +++--- 6 files changed, 30 insertions(+), 21 deletions(-)