From patchwork Wed Jul 26 18:19:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9865657 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C5006038F for ; Wed, 26 Jul 2017 18:22:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38CDE287BD for ; Wed, 26 Jul 2017 18:22:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DBD0287C0; Wed, 26 Jul 2017 18:22:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEA4B287BD for ; Wed, 26 Jul 2017 18:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751379AbdGZSWh (ORCPT ); Wed, 26 Jul 2017 14:22:37 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35982 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751444AbdGZSWW (ORCPT ); Wed, 26 Jul 2017 14:22:22 -0400 Received: by mail-pg0-f66.google.com with SMTP id y129so18061990pgy.3; Wed, 26 Jul 2017 11:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KdroAGSEjsg1B0VFM7ILk3jCRA5+JMuMUH3N+/ecZRU=; b=QmcFYTaY5Qk37Or6X4wwU+XlCt3EATi6MjsCSOOCDxXxKQUua1iFFlX1UZuwv+EPGR usec0cJsuTkMM82n3S9/P/Sjsow7b7yCEfWYxzz3h2c4OJr8enrU3fdasMu+tdpPVR1u ItI/pTxqRMpm2bSjFxg11ajHXqe/wQfWq7e4mElBnOX+COud/Vi7Mh65aJ3TQD/nPjdn wgKfoqUKr5ESKzVGI7XS39IE2IJImvPRSQBmKjyu2H2GGD3jEJ7Djjb7s/wCEdx4s5i2 6mCAkWGtc2tGLEC73UejktLrCAMd95oQwPjZ2HwpM3x+97M+LwpaZVSHhuws/NUzjDsF rZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KdroAGSEjsg1B0VFM7ILk3jCRA5+JMuMUH3N+/ecZRU=; b=cxfzNC9vMk+ctvY1vaPDC7BL/gr9lG+pBapvwduWARdgKt3IE7i2xnmWwaWOiuGLPR 8NjoNAxyL4bPrVuQMh8T4r/2LXwZRkvc//e3bkV09HFG8eXRclBt0qLJ7e0+vyg6VzTy g7FSm5PBalrAGpI/0vi1gHw2MsqnKj/KIJOKuSWP6hZC7XtdyYP9WV7Zxu+U+Uk/vflB J3wSIZG+gccMzb82fgd0WijvYGfY85h+mlH23pEJUdieSm6hDNsZ+iOJyWJY4wdw1oIF 5HGn5/SJ8SUfe9krygnjC986sAh0AFfFB+SurrxwBv2NaHrehgo3c6Q4wE/vrZhz7K/1 KNZw== X-Gm-Message-State: AIVw111xviQRF9Tri1dSbGPbsClHAaMBAbbSIjYLTuD/diTbTuGU/Mxp BDJk5yUb7xrq2gWyNnI= X-Received: by 10.99.172.17 with SMTP id v17mr1706077pge.196.1501093341979; Wed, 26 Jul 2017 11:22:21 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id b4sm28394064pgc.9.2017.07.26.11.22.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 11:22:21 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-crypto@vger.kernel.org, "Theodore Y . Ts'o" , Jaegeuk Kim , Alex Cope , Michael Halcrow , Eric Biggers Subject: [PATCH v2 7/7] fscrypt: for v2 policies, support "fscrypt:" key prefix only Date: Wed, 26 Jul 2017 11:19:29 -0700 Message-Id: <20170726181929.99880-8-ebiggers3@gmail.com> X-Mailer: git-send-email 2.14.0.rc0.400.g1c36432dff-goog In-Reply-To: <20170726181929.99880-1-ebiggers3@gmail.com> References: <20170726181929.99880-1-ebiggers3@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Since v2 encryption policies are opt-in, take the opportunity to also drop support for the legacy filesystem-specific key description prefixes "ext4:", "f2fs:", and "ubifs:", instead requiring the generic prefix "fscrypt:". The generic prefix is preferred since it works for all filesystems. Also there is a performance benefit from not having to search the keyrings twice. The old prefixes remain supported for v1 encryption policies. Reviewed-by: Michael Halcrow Signed-off-by: Eric Biggers --- fs/crypto/fscrypt_private.h | 3 +-- fs/crypto/keyinfo.c | 16 ++++------------ fs/crypto/policy.c | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 4221c5b23882..c9de15d4b5b0 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -169,8 +169,7 @@ extern struct page *fscrypt_alloc_bounce_page(struct fscrypt_ctx *ctx, gfp_t gfp_flags); /* keyinfo.c */ -extern int fscrypt_compute_key_hash(const struct inode *inode, - const struct fscrypt_policy *policy, +extern int fscrypt_compute_key_hash(const struct fscrypt_policy *policy, u8 hash[FSCRYPT_KEY_HASH_SIZE]); extern void __exit fscrypt_essiv_cleanup(void); diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 2fca72826768..81b08d4a7efe 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -384,8 +384,7 @@ find_and_lock_keyring_key(const char *prefix, } static struct fscrypt_master_key * -load_master_key_from_keyring(const struct inode *inode, - const u8 descriptor[FS_KEY_DESCRIPTOR_SIZE], +load_master_key_from_keyring(const u8 descriptor[FS_KEY_DESCRIPTOR_SIZE], unsigned int min_keysize) { struct key *keyring_key; @@ -394,11 +393,6 @@ load_master_key_from_keyring(const struct inode *inode, keyring_key = find_and_lock_keyring_key(FS_KEY_DESC_PREFIX, descriptor, min_keysize, &payload); - if (keyring_key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { - keyring_key = find_and_lock_keyring_key( - inode->i_sb->s_cop->key_prefix, - descriptor, min_keysize, &payload); - } if (IS_ERR(keyring_key)) return ERR_CAST(keyring_key); @@ -440,8 +434,7 @@ find_or_create_master_key(const struct inode *inode, /* * The needed master key isn't in memory yet. Load it from the keyring. */ - master_key = load_master_key_from_keyring(inode, - ctx->master_key_descriptor, + master_key = load_master_key_from_keyring(ctx->master_key_descriptor, min_keysize); if (IS_ERR(master_key)) return master_key; @@ -675,8 +668,7 @@ void __exit fscrypt_essiv_cleanup(void) crypto_free_shash(essiv_hash_tfm); } -int fscrypt_compute_key_hash(const struct inode *inode, - const struct fscrypt_policy *policy, +int fscrypt_compute_key_hash(const struct fscrypt_policy *policy, u8 hash[FSCRYPT_KEY_HASH_SIZE]) { struct fscrypt_master_key *k; @@ -690,7 +682,7 @@ int fscrypt_compute_key_hash(const struct inode *inode, max(available_modes[policy->contents_encryption_mode].keysize, available_modes[policy->filenames_encryption_mode].keysize); - k = load_master_key_from_keyring(inode, policy->master_key_descriptor, + k = load_master_key_from_keyring(policy->master_key_descriptor, min_keysize); if (IS_ERR(k)) return PTR_ERR(k); diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index ece55350cee8..fa5599005a72 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -119,7 +119,7 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg) pr_warn_once("%s (pid %d) is setting less secure v0 encryption policy; recommend upgrading to v2.\n", current->comm, current->pid); } else { - ret = fscrypt_compute_key_hash(inode, &policy, key_hash); + ret = fscrypt_compute_key_hash(&policy, key_hash); if (ret) return ret; }