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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A94CFC31E40 for ; Tue, 13 Aug 2019 00:40:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 77BFD206A2 for ; Tue, 13 Aug 2019 00:40:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Dwo7rLU0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77BFD206A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mit.edu Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o94h1g0rQE91OcO4dtZwFomvOCUdlqra7pmJ40cBIcg=; b=Dwo7rLU0FC2R07 g2hOaUoKrhrb8I+2QWX9tVsJ+SmKAyE/SPVJWIF7vx5Edhn2/sALW6evzAI6uzEcAp5/4s90GJTwz UIrVc4Bbm/abZeD1x0oOnJPMFOxKIVSRyA9o2oVb5WZ1we5LeqHGyU+PJ52UJwTFszYyqHugF9a0Z oTHR9Z8C5MSJvjsI27YnlgMhDTFCtmMlSC88YWBPKsbHxwz2u3Z2YGoFNq8jPffoXQ7tasNzuJIjE hVDnUu0AN2mF/7hEzHfJe9Agz3hhBdlpvtxchzloo2o3EDuVHGwy6Jyfya0HYZDf/qsZn3wt5I5x3 hbAqh1xyjfyxWCyf/SCw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxKqp-0004FZ-CI; Tue, 13 Aug 2019 00:39:47 +0000 Received: from outgoing-auth-1.mit.edu ([18.9.28.11] helo=outgoing.mit.edu) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxKqm-0004Ex-Ec for linux-mtd@lists.infradead.org; Tue, 13 Aug 2019 00:39:46 +0000 Received: from callcc.thunk.org (guestnat-104-133-9-109.corp.google.com [104.133.9.109] (may be forged)) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id x7D0dcO9023746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Aug 2019 20:39:39 -0400 Received: by callcc.thunk.org (Postfix, from userid 15806) id B8C504218EF; Mon, 12 Aug 2019 20:39:37 -0400 (EDT) Date: Mon, 12 Aug 2019 20:39:37 -0400 From: "Theodore Y. Ts'o" To: Eric Biggers Subject: Re: [PATCH v8 13/20] fscrypt: v2 encryption policy support Message-ID: <20190813003937.GK28705@mit.edu> References: <20190805162521.90882-1-ebiggers@kernel.org> <20190805162521.90882-14-ebiggers@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190805162521.90882-14-ebiggers@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190812_173944_655549_14800FF2 X-CRM114-Status: GOOD ( 20.14 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Satya Tangirala , linux-api@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org, keyrings@vger.kernel.org, linux-mtd@lists.infradead.org, linux-crypto@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jaegeuk Kim , linux-ext4@vger.kernel.org, Paul Crowley Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org On Mon, Aug 05, 2019 at 09:25:14AM -0700, Eric Biggers wrote: > From: Eric Biggers > > Add a new fscrypt policy version, "v2". It has the following changes > from the original policy version, which we call "v1" (*): > > - Master keys (the user-provided encryption keys) are only ever used as > input to HKDF-SHA512. This is more flexible and less error-prone, and > it avoids the quirks and limitations of the AES-128-ECB based KDF. > Three classes of cryptographically isolated subkeys are defined: > > - Per-file keys, like used in v1 policies except for the new KDF. > > - Per-mode keys. These implement the semantics of the DIRECT_KEY > flag, which for v1 policies made the master key be used directly. > These are also planned to be used for inline encryption when > support for it is added. > > - Key identifiers (see below). > > - Each master key is identified by a 16-byte master_key_identifier, > which is derived from the key itself using HKDF-SHA512. This prevents > users from associating the wrong key with an encrypted file or > directory. This was easily possible with v1 policies, which > identified the key by an arbitrary 8-byte master_key_descriptor. > > - The key must be provided in the filesystem-level keyring, not in a > process-subscribed keyring. > > The following UAPI additions are made: > > - The existing ioctl FS_IOC_SET_ENCRYPTION_POLICY can now be passed a > fscrypt_policy_v2 to set a v2 encryption policy. It's disambiguated > from fscrypt_policy/fscrypt_policy_v1 by the version code prefix. > > - A new ioctl FS_IOC_GET_ENCRYPTION_POLICY_EX is added. It allows > getting the v1 or v2 encryption policy of an encrypted file or > directory. The existing FS_IOC_GET_ENCRYPTION_POLICY ioctl could not > be used because it did not have a way for userspace to indicate which > policy structure is expected. The new ioctl includes a size field, so > it is extensible to future fscrypt policy versions. > > - The ioctls FS_IOC_ADD_ENCRYPTION_KEY, FS_IOC_REMOVE_ENCRYPTION_KEY, > and FS_IOC_GET_ENCRYPTION_KEY_STATUS now support managing keys for v2 > encryption policies. Such keys are kept logically separate from keys > for v1 encryption policies, and are identified by 'identifier' rather > than by 'descriptor'. The 'identifier' need not be provided when > adding a key, since the kernel will calculate it anyway. > > This patch temporarily keeps adding/removing v2 policy keys behind the > same permission check done for adding/removing v1 policy keys: > capable(CAP_SYS_ADMIN). However, the next patch will carefully take > advantage of the cryptographically secure master_key_identifier to allow > non-root users to add/remove v2 policy keys, thus providing a full > replacement for v1 policies. > > (*) Actually, in the API fscrypt_policy::version is 0 while on-disk > fscrypt_context::format is 1. But I believe it makes the most sense > to advance both to '2' to have them be in sync, and to consider the > numbering to start at 1 except for the API quirk. > > Signed-off-by: Eric Biggers Looks good, feel free to add: Reviewed-by: Theodore Ts'o ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/