| Message ID | 20191203051049.44573-2-drosen@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support for Casefolding and Encryption | expand |
On Mon, Dec 02, 2019 at 09:10:42PM -0800, Daniel Rosenberg wrote: > When using casefolding along with encryption, we need to use a > cryptographic hash to allow fast filesystem operations while not knowing > the case of the name stored on disk while not revealing extra > information about the name if the key is not present. This sentence is hard to parse. Can you make it any clearer? > > When a v2 policy is used on a directory, we derive a key for use with > siphash. > > Signed-off-by: Daniel Rosenberg <drosen@google.com> > --- > fs/crypto/fname.c | 22 ++++++++++++++++++++++ > fs/crypto/fscrypt_private.h | 9 +++++++++ > fs/crypto/keysetup.c | 29 ++++++++++++++++++++--------- > include/linux/fscrypt.h | 8 ++++++++ > 4 files changed, 59 insertions(+), 9 deletions(-) > > diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c > index 3da3707c10e3..b33f03b9f892 100644 > --- a/fs/crypto/fname.c > +++ b/fs/crypto/fname.c > @@ -12,6 +12,7 @@ > */ > > #include <linux/scatterlist.h> > +#include <linux/siphash.h> > #include <crypto/skcipher.h> > #include "fscrypt_private.h" > > @@ -400,3 +401,24 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, > return ret; > } > EXPORT_SYMBOL(fscrypt_setup_filename); > + > +/** > + * fscrypt_fname_siphash() - Calculate the siphash for a file name > + * @dir: the parent directory > + * @name: the name of the file to get the siphash of > + * > + * Given a user-provided filename @name, this function calculates the siphash of > + * that name using the hash key stored with the directory's policy. I suggest writing "using the directory's hash key" instead of "using the hash key stored with the directory's policy", since the latter might be misunderstood as meaning that the hash key is stored on-disk. Also it would be helpful to document the assumptions: The directory must use a v2 encryption policy, and its key must be available. > + * > + * > + * Return: the siphash of @name using the hash key of @dir > + */ > +u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name) > +{ > + struct fscrypt_info *ci = dir->i_crypt_info; > + > + WARN_ON(!ci || !ci->ci_hash_key_initialized); > + > + return siphash(name->name, name->len, &ci->ci_hash_key); > +} > +EXPORT_SYMBOL(fscrypt_fname_siphash); The !ci part of the WARN_ON is pointless because if it ever triggers, there will be a NULL dereference afterwards anyway. I suggest changing it to just: WARN_ON(!ci->ci_hash_key_initialized); > diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h > index 130b50e5a011..f0dfef9921de 100644 > --- a/fs/crypto/fscrypt_private.h > +++ b/fs/crypto/fscrypt_private.h > @@ -12,6 +12,7 @@ > #define _FSCRYPT_PRIVATE_H > > #include <linux/fscrypt.h> > +#include <linux/siphash.h> > #include <crypto/hash.h> > > #define CONST_STRLEN(str) (sizeof(str) - 1) > @@ -194,6 +195,13 @@ struct fscrypt_info { > */ > struct fscrypt_direct_key *ci_direct_key; > > + /* > + * With v2 policies, this can be used with siphash > + * When the key has been set, ci_hash_key_initialized is set to true > + */ > + siphash_key_t ci_hash_key; > + bool ci_hash_key_initialized; > + > /* The encryption policy used by this inode */ > union fscrypt_policy ci_policy; > > @@ -286,6 +294,7 @@ extern int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key, > #define HKDF_CONTEXT_PER_FILE_KEY 2 > #define HKDF_CONTEXT_DIRECT_KEY 3 > #define HKDF_CONTEXT_IV_INO_LBLK_64_KEY 4 > +#define HKDF_CONTEXT_FNAME_HASH_KEY 5 > > extern int fscrypt_hkdf_expand(struct fscrypt_hkdf *hkdf, u8 context, > const u8 *info, unsigned int infolen, > diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c > index f577bb6613f9..e6c7ec04cd25 100644 > --- a/fs/crypto/keysetup.c > +++ b/fs/crypto/keysetup.c > @@ -192,7 +192,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, > ci->ci_mode->friendly_name); > return -EINVAL; > } > - return setup_per_mode_key(ci, mk, mk->mk_direct_tfms, > + err = setup_per_mode_key(ci, mk, mk->mk_direct_tfms, > HKDF_CONTEXT_DIRECT_KEY, false); > } else if (ci->ci_policy.v2.flags & > FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64) { > @@ -202,20 +202,31 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, > * the IVs. This format is optimized for use with inline > * encryption hardware compliant with the UFS or eMMC standards. > */ > - return setup_per_mode_key(ci, mk, mk->mk_iv_ino_lblk_64_tfms, > + err = setup_per_mode_key(ci, mk, mk->mk_iv_ino_lblk_64_tfms, > HKDF_CONTEXT_IV_INO_LBLK_64_KEY, > true); > - } > - > - err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, > + } else { > + err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, > HKDF_CONTEXT_PER_FILE_KEY, > ci->ci_nonce, FS_KEY_DERIVATION_NONCE_SIZE, > derived_key, ci->ci_mode->keysize); Nit: keep continuation lines aligned when they don't exceed 80 characters: err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, HKDF_CONTEXT_PER_FILE_KEY, ci->ci_nonce, FS_KEY_DERIVATION_NONCE_SIZE, derived_key, ci->ci_mode->keysize); > - if (err) > - return err; > + if (err) > + return err; > + > + err = fscrypt_set_derived_key(ci, derived_key); > + memzero_explicit(derived_key, ci->ci_mode->keysize); > + if (err) > + return err; This 'if (err)' check is in the wrong place. It needs to be below the brace below, so that it also checks the error from setup_per_mode_key(). > + } > > - err = fscrypt_set_derived_key(ci, derived_key); > - memzero_explicit(derived_key, ci->ci_mode->keysize); > + if (S_ISDIR(ci->ci_inode->i_mode)) { > + 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)); Nit: keep continuation lines aligned when they don't exceed 80 characters: 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)); > + if (!err) > + ci->ci_hash_key_initialized = true; > + } > return err; Nit: an early return on error would be better here (consistent with the code above): if (err) return err; ci->ci_hash_key_initialized = true; } return 0; > +extern u64 fscrypt_fname_siphash(const struct inode *dir, > + const struct qstr *name); Nit: align the continuation line: extern u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name); > > #define FSCRYPT_FNAME_MAX_UNDIGESTED_SIZE 32 > > @@ -446,6 +448,12 @@ static inline int fscrypt_fname_disk_to_usr(struct inode *inode, > return -EOPNOTSUPP; > } > > +static inline u64 fscrypt_fname_siphash(const struct inode *inode, In the other places the first parameter is called 'dir', not 'inode'. - Eric
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 3da3707c10e3..b33f03b9f892 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -12,6 +12,7 @@ */ #include <linux/scatterlist.h> +#include <linux/siphash.h> #include <crypto/skcipher.h> #include "fscrypt_private.h" @@ -400,3 +401,24 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, return ret; } EXPORT_SYMBOL(fscrypt_setup_filename); + +/** + * fscrypt_fname_siphash() - Calculate the siphash for a file name + * @dir: the parent directory + * @name: the name of the file to get the siphash of + * + * Given a user-provided filename @name, this function calculates the siphash of + * that name using the hash key stored with the directory's policy. + * + * + * Return: the siphash of @name using the hash key of @dir + */ +u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name) +{ + struct fscrypt_info *ci = dir->i_crypt_info; + + WARN_ON(!ci || !ci->ci_hash_key_initialized); + + return siphash(name->name, name->len, &ci->ci_hash_key); +} +EXPORT_SYMBOL(fscrypt_fname_siphash); diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 130b50e5a011..f0dfef9921de 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -12,6 +12,7 @@ #define _FSCRYPT_PRIVATE_H #include <linux/fscrypt.h> +#include <linux/siphash.h> #include <crypto/hash.h> #define CONST_STRLEN(str) (sizeof(str) - 1) @@ -194,6 +195,13 @@ struct fscrypt_info { */ struct fscrypt_direct_key *ci_direct_key; + /* + * With v2 policies, this can be used with siphash + * When the key has been set, ci_hash_key_initialized is set to true + */ + siphash_key_t ci_hash_key; + bool ci_hash_key_initialized; + /* The encryption policy used by this inode */ union fscrypt_policy ci_policy; @@ -286,6 +294,7 @@ extern int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key, #define HKDF_CONTEXT_PER_FILE_KEY 2 #define HKDF_CONTEXT_DIRECT_KEY 3 #define HKDF_CONTEXT_IV_INO_LBLK_64_KEY 4 +#define HKDF_CONTEXT_FNAME_HASH_KEY 5 extern int fscrypt_hkdf_expand(struct fscrypt_hkdf *hkdf, u8 context, const u8 *info, unsigned int infolen, diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index f577bb6613f9..e6c7ec04cd25 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -192,7 +192,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, ci->ci_mode->friendly_name); return -EINVAL; } - return setup_per_mode_key(ci, mk, mk->mk_direct_tfms, + err = setup_per_mode_key(ci, mk, mk->mk_direct_tfms, HKDF_CONTEXT_DIRECT_KEY, false); } else if (ci->ci_policy.v2.flags & FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64) { @@ -202,20 +202,31 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci, * the IVs. This format is optimized for use with inline * encryption hardware compliant with the UFS or eMMC standards. */ - return setup_per_mode_key(ci, mk, mk->mk_iv_ino_lblk_64_tfms, + err = setup_per_mode_key(ci, mk, mk->mk_iv_ino_lblk_64_tfms, HKDF_CONTEXT_IV_INO_LBLK_64_KEY, true); - } - - err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, + } else { + err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf, HKDF_CONTEXT_PER_FILE_KEY, ci->ci_nonce, FS_KEY_DERIVATION_NONCE_SIZE, derived_key, ci->ci_mode->keysize); - if (err) - return err; + if (err) + return err; + + err = fscrypt_set_derived_key(ci, derived_key); + memzero_explicit(derived_key, ci->ci_mode->keysize); + if (err) + return err; + } - err = fscrypt_set_derived_key(ci, derived_key); - memzero_explicit(derived_key, ci->ci_mode->keysize); + if (S_ISDIR(ci->ci_inode->i_mode)) { + 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)); + if (!err) + ci->ci_hash_key_initialized = true; + } return err; } diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 1a7bffe78ed5..e13ff68a99f0 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -155,6 +155,8 @@ extern int fscrypt_fname_alloc_buffer(const struct inode *, u32, extern void fscrypt_fname_free_buffer(struct fscrypt_str *); extern int fscrypt_fname_disk_to_usr(struct inode *, u32, u32, const struct fscrypt_str *, struct fscrypt_str *); +extern u64 fscrypt_fname_siphash(const struct inode *dir, + const struct qstr *name); #define FSCRYPT_FNAME_MAX_UNDIGESTED_SIZE 32 @@ -446,6 +448,12 @@ static inline int fscrypt_fname_disk_to_usr(struct inode *inode, return -EOPNOTSUPP; } +static inline u64 fscrypt_fname_siphash(const struct inode *inode, + const struct qstr *name) +{ + return 0; +} + static inline bool fscrypt_match_name(const struct fscrypt_name *fname, const u8 *de_name, u32 de_name_len) {
When using casefolding along with encryption, we need to use a cryptographic hash to allow fast filesystem operations while not knowing the case of the name stored on disk while not revealing extra information about the name if the key is not present. When a v2 policy is used on a directory, we derive a key for use with siphash. Signed-off-by: Daniel Rosenberg <drosen@google.com> --- fs/crypto/fname.c | 22 ++++++++++++++++++++++ fs/crypto/fscrypt_private.h | 9 +++++++++ fs/crypto/keysetup.c | 29 ++++++++++++++++++++--------- include/linux/fscrypt.h | 8 ++++++++ 4 files changed, 59 insertions(+), 9 deletions(-)