Message ID | ec25bd8540fb43d38a1f58d3df2f43299c50f7d2.1695750478.git.josef@toxicpanda.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-fscrypt-owner@vger.kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4655EEB563 for <linux-fscrypt@archiver.kernel.org>; Tue, 26 Sep 2023 18:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235425AbjIZSDc (ORCPT <rfc822;linux-fscrypt@archiver.kernel.org>); Tue, 26 Sep 2023 14:03:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235434AbjIZSDb (ORCPT <rfc822;linux-fscrypt@vger.kernel.org>); Tue, 26 Sep 2023 14:03:31 -0400 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE003198 for <linux-fscrypt@vger.kernel.org>; Tue, 26 Sep 2023 11:03:24 -0700 (PDT) Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-41808baf6abso46324591cf.3 for <linux-fscrypt@vger.kernel.org>; Tue, 26 Sep 2023 11:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1695751404; x=1696356204; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1X/0Zt7z+oOh2YdMAkIlfw4aC9CST8nDgU19CDUdTeo=; b=WLNpH+i55iMeC2wrjZcx7lyoHFaw+oHCxkqfbX3Ca9UW4rdeN962wVVj3rhkeO89Pi /xH/FH0YTUpXKU9xUP5n0/aV050hPwfs6fJRWidOxNVZUfEu5UTTuZsyfCo9JFEeUqDt TF1RgiCrYAM3BRGvyacTDCML33qDvRzPuCjsGfa6Or60IynKfQlC+khjkzMokg3lsIMP qWL5vydJV4TgJAoei3AX34fiW40cMd4GeBa+hxLLWkS6CedLoBMdEqcyquQ6r8iK7INU ENwCZFHaRolxyFjd9CJ0rdPUqWgFuMNti0mvS0WN2BfrrlSwwtLSw73Z9LbwAnXusHs6 SAcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695751404; x=1696356204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1X/0Zt7z+oOh2YdMAkIlfw4aC9CST8nDgU19CDUdTeo=; b=tlK+tGpTzMxRg47v4azxHmC34GHIAmXmskgJr1QUQbwtaoo7W5wi11L5fQogR6FOS2 L9Iq9T3B4OMct3WEnXyV+3Q1cV28Ojdw8oro39re7LHDJ9PZHwYVY70dKjyYk6eaq1QY ClZIx6e7VkLECbB8Oo9whkRxqFdEaTxeVBi6zALp/nrpiM7M6y5WAyRMjaMbx7/wMaqR VwJkkclx2gKeAy5s/a3vFceCg8NwFSuBKKVIHcHrmO/Fhm7IaG1zwg10ExfVZB6ZV+7u UWeAOpxLn1Y2LuKf+O8j0kqqvN3SSi2PGaigLUmdM+pS3hywXcRaeFg1rmBcE4oeTPsb 1gQQ== X-Gm-Message-State: AOJu0Yz/2NzpE43W532/qvkfrfRrhRCnZH5u1BzZ6DIQwpq4WceGxjE2 fty2orjUj8kSaY3Fk6+2ySeFE2R1tODZ3n6diAJaLw== X-Google-Smtp-Source: AGHT+IH6PNxwFL432DfaPRHZ68/+mdDkldoTR7HOMu7wPlfBa0i9UL0sFgc9BGkEzDV/1Dz8YKKvjQ== X-Received: by 2002:a05:622a:1819:b0:419:51d1:5456 with SMTP id t25-20020a05622a181900b0041951d15456mr2166009qtc.22.1695751403859; Tue, 26 Sep 2023 11:03:23 -0700 (PDT) Received: from localhost (cpe-76-182-20-124.nc.res.rr.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id fe12-20020a05622a4d4c00b004109928c607sm4825887qtb.43.2023.09.26.11.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 11:03:23 -0700 (PDT) From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com, ebiggers@kernel.org, linux-fscrypt@vger.kernel.org, ngompa13@gmail.com Cc: Sweet Tea Dorminy <sweettea-kernel@dorminy.me> Subject: [PATCH 09/35] btrfs: disable verity on encrypted inodes Date: Tue, 26 Sep 2023 14:01:35 -0400 Message-ID: <ec25bd8540fb43d38a1f58d3df2f43299c50f7d2.1695750478.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1695750478.git.josef@toxicpanda.com> References: <cover.1695750478.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-fscrypt.vger.kernel.org> X-Mailing-List: linux-fscrypt@vger.kernel.org |
Series |
btrfs: add fscrypt support
|
expand
|
diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c index 66e2270b0dae..92536913df04 100644 --- a/fs/btrfs/verity.c +++ b/fs/btrfs/verity.c @@ -588,6 +588,9 @@ static int btrfs_begin_enable_verity(struct file *filp) ASSERT(inode_is_locked(file_inode(filp))); + if (IS_ENCRYPTED(&inode->vfs_inode)) + return -EINVAL; + if (test_bit(BTRFS_INODE_VERITY_IN_PROGRESS, &inode->runtime_flags)) return -EBUSY;