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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham 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 19CF2C33CB6 for ; Fri, 17 Jan 2020 21:43:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4DFD2176D for ; Fri, 17 Jan 2020 21:43:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HgH/cjvr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729818AbgAQVnI (ORCPT ); Fri, 17 Jan 2020 16:43:08 -0500 Received: from mail-vk1-f202.google.com ([209.85.221.202]:45727 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729340AbgAQVnG (ORCPT ); Fri, 17 Jan 2020 16:43:06 -0500 Received: by mail-vk1-f202.google.com with SMTP id 128so10255246vka.12 for ; Fri, 17 Jan 2020 13:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Q4rBdwTpu0kgcesfAqettRZRoe3eJIs+PO2/oZPudMI=; b=HgH/cjvrF4Zia0V0+IeU5NYRKU1aapr1ropmrp6wIQEhHKtyjKZuynqRYZXyB6R0iK M2gvpJkEsO67KRph9gY05tFOH+FqKAIxduQZ1V9cE1pI6KCoFEgF5hiXeUyBak4o5CHB pC2wEBiQBi7O2M65FW7rjDF5NwtzLRJEXal88aPC8G+3EUBIwKRyt9hrc0SevGsO2q9V ZhhpNLkkikMSEdps2HlgtM/v/nAVY60CZKzDcl1eyYCbY8yr3hu3NggL9wcq8AT0cych /o5RTDmU82+mRI5AKUX31wCwtJqLzhwEPgaDpYSI+MsIUhkkkYw3NWF7A95mbwJx1ey0 itxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Q4rBdwTpu0kgcesfAqettRZRoe3eJIs+PO2/oZPudMI=; b=rl9PUE15lJYx2A2gYsmUy33l5K1qurnlKSc8BxEqj9nddrBCaNN+Hd8CsV6ZcmvaFw HLmANTEG5vI31tLLG2ojkqekmWokZA2l12Nfv9P90nLxM+/GEhOKyoFqpFatve6olZqf VusMLzEqAEnHpGTrKvHJ+JogKHhQuv5qBQd0uTlLzsE7VpEXFLJCm/n/m1t186zunI5I wdLb/wHS/Ob2KCchcRSZJOQyw2Rv3Drp24/h5tBRy1mMN+AfDhXCgX48mVYn7Xcdv1NZ modYc/Kyb4rQm2+kyKhGREWIfDkh5yRtqHCrWgppJCfSyUZnHcmzxI+VDu1u0XNTTNZ4 LIKA== X-Gm-Message-State: APjAAAWEXrsVncNPlIwxVxZxaV4B3vZTvtVEvDt7+doEgWLgFSdxaZIO 6R8HozT2ZWPFOMwWmrJzTvNPnghNccI= X-Google-Smtp-Source: APXvYqxzCff7DvKzBojWKyAGZ3dq8QFpSmD6KoOeo/TuurTUuCeKd0w8VmzzbGwNUGOYIzxOpi9DPxWBE9M= X-Received: by 2002:ab0:48cf:: with SMTP id y15mr24885192uac.26.1579297385289; Fri, 17 Jan 2020 13:43:05 -0800 (PST) Date: Fri, 17 Jan 2020 13:42:41 -0800 In-Reply-To: <20200117214246.235591-1-drosen@google.com> Message-Id: <20200117214246.235591-5-drosen@google.com> Mime-Version: 1.0 References: <20200117214246.235591-1-drosen@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v3 4/9] fscrypt: Only create hash key when needed From: Daniel Rosenberg To: "Theodore Ts'o" , linux-ext4@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net, Eric Biggers , linux-fscrypt@vger.kernel.org, Alexander Viro Cc: Andreas Dilger , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Gabriel Krisman Bertazi , kernel-team@android.com, Daniel Rosenberg Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org If a directory isn't casefolded, it doesn't need the hash key. Skip deriving it unless we enable it later. Signed-off-by: Daniel Rosenberg --- fs/crypto/keysetup.c | 2 +- fs/crypto/policy.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index 7445ab76e0b32..c0db9e8d31f15 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -217,7 +217,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, if (err) return err; - if (S_ISDIR(ci->ci_inode->i_mode)) { + if (S_ISDIR(ci->ci_inode->i_mode) && IS_CASEFOLDED(ci->ci_inode)) { err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, HKDF_CONTEXT_FNAME_HASH_KEY, ci->ci_nonce, diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 2cd9a940d8f46..632ca355e1184 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -10,6 +10,7 @@ * Modified by Eric Biggers, 2019 for v2 policy support. */ +#include #include #include #include @@ -591,6 +592,8 @@ int fscrypt_ioc_setflags_prepare(struct inode *inode, unsigned int flags) { union fscrypt_policy policy; + struct fscrypt_info *ci; + struct fscrypt_master_key *mk; int err; /* @@ -603,6 +606,28 @@ int fscrypt_ioc_setflags_prepare(struct inode *inode, return err; if (policy.version != FSCRYPT_POLICY_V2) return -EINVAL; + err = fscrypt_require_key(inode); + if (err) + return err; + ci = inode->i_crypt_info; + if (ci->ci_hash_key_initialized) + return 0; + mk = ci->ci_master_key->payload.data[0]; + down_read(&mk->mk_secret_sem); + if (!is_master_key_secret_present(&mk->mk_secret)) { + err = -ENOKEY; + } else { + err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, + HKDF_CONTEXT_FNAME_HASH_KEY, + ci->ci_nonce, + FS_KEY_DERIVATION_NONCE_SIZE, + (u8 *)&ci->ci_hash_key, + sizeof(ci->ci_hash_key)); + } + up_read(&mk->mk_secret_sem); + if (err) + return err; + ci->ci_hash_key_initialized = true; } return 0; -- 2.25.0.341.g760bfbb309-goog