btrfs: add fscrypt integration
v2 cover btrfs: add fscrypt integration
This is a draft set of changes adding fscrypt integration to btrfs.
Last October, Omar sent out a design document for having fscrypt integration with btrfs [1]. In summary, it proposes btrfs storing its own encryption IVs on a per-file-extent basis. fscrypt usually encrypts files using an IV derived from per-inode information; this would prevent snapshotting or reflinking or data relocation for btrfs, but by using an IV associated with each file extent, all the inodes sharing a particular key and file extent may decrypt successfully.
This series starts implementing it on the kernel side for the simple case, non-compressed data extents. My goal in sending out this RFC is to get feedback on whether these are going in a reasonable direction; while there are a couple of additional parts, they're fundamentally minor compared to this.
Not included are a couple of minor changes to btrfs-progs; additionally, none of the fscrypt tool changes needed to use the new encryption policy are included. Obviously, additional fstests will be needed. Also not yet included are encryption for inline data extents, verity items, and compressed data.
[1]
https://lore.kernel.org/linux-btrfs/[email protected]/
Changelog:
v2:
- Fixed all warnings and known incorrectnesses.
- Split fscrypt changes into their own patchset:
https://lore.kernel.org/linux-fscrypt/[email protected]
- Combined and reordered changes so that enabling fscrypt is the last change.
- Removed unnecessary factoring.
- Split a cleanup change off.
v1:
- https://lore.kernel.org/linux-btrfs/[email protected]
Omar Sandoval (13):
btrfs: store directories' encryption state
btrfs: factor a fscrypt_name matching method
btrfs: disable various operations on encrypted inodes
btrfs: add fscrypt operation table to superblock
btrfs: start using fscrypt hooks.
btrfs: add a subvolume flag for whole-volume encryption
btrfs: translate btrfs encryption flags and encrypted inode flag.
btrfs: store an IV per encrypted normal file extent
btrfs: Add new FEATURE_INCOMPAT_FSCRYPT feature flag.
btrfs: reuse encrypted filename hash when possible.
btrfs: adapt directory read and lookup to potentially encrypted
filenames
btrfs: encrypt normal file extent data if appropriate
btrfs: implement fscrypt ioctls
Sweet Tea Dorminy (3):
btrfs: use fscrypt_name's instead of name/len everywhere.
btrfs: setup fscrypt_names from dentrys using helper
btrfs: add iv generation function for fscrypt
fs/btrfs/Makefile | 1 + fs/btrfs/btrfs_inode.h | 3 + fs/btrfs/ctree.h | 113 +++++-- fs/btrfs/delayed-inode.c | 48 ++- fs/btrfs/delayed-inode.h | 9 +- fs/btrfs/dir-item.c | 120 ++++--- fs/btrfs/extent_io.c | 93 +++++- fs/btrfs/extent_io.h | 2 + fs/btrfs/extent_map.h | 8 + fs/btrfs/file-item.c | 20 +- fs/btrfs/file.c | 11 +- fs/btrfs/fscrypt.c | 224 +++++++++++++ fs/btrfs/fscrypt.h | 49 +++ fs/btrfs/inode-item.c | 84 ++--- fs/btrfs/inode-item.h | 14 +- fs/btrfs/inode.c | 547 ++++++++++++++++++++++++-------- fs/btrfs/ioctl.c | 80 ++++- fs/btrfs/ordered-data.c | 12 +- fs/btrfs/ordered-data.h | 3 +- fs/btrfs/print-tree.c | 4 +- fs/btrfs/props.c | 11 +- fs/btrfs/reflink.c | 8 + fs/btrfs/root-tree.c | 20 +- fs/btrfs/send.c | 141 ++++---- fs/btrfs/super.c | 8 +- fs/btrfs/transaction.c | 43 ++- fs/btrfs/tree-checker.c | 56 +++- fs/btrfs/tree-log.c | 261 ++++++++------- fs/btrfs/tree-log.h | 4 +- fs/btrfs/xattr.c | 21 +- include/uapi/linux/btrfs.h | 1 + include/uapi/linux/btrfs_tree.h | 26 ++ 32 files changed, 1525 insertions(+), 520 deletions(-) create mode 100644 fs/btrfs/fscrypt.c create mode 100644 fs/btrfs/fscrypt.h
Signature · 1 line
2.35.1
RFC PATCH v2 1/16 btrfs: store directorys' encryption state
From: Omar Sandoval <[email protected]>
For directories with encrypted files/filenames, we need to store a flag indicating this fact. There's no room in other fields, so we'll need to borrow a bit from dir_type. Since it's now a combination of type and flags, we rename it to dir_flags to reflect its new usage.
The new flag, FT_FSCRYPT, indicates a (perhaps partially) encrypted directory, which is orthogonal to file type; therefore, add the new flag, and make conversion from directory type to file type strip the flag.
--- fs/btrfs/ctree.h | 10 ++++++++-- fs/btrfs/delayed-inode.c | 6 +++--- fs/btrfs/delayed-inode.h | 2 +- fs/btrfs/dir-item.c | 4 ++-- fs/btrfs/inode.c | 15 +++++++++------ fs/btrfs/print-tree.c | 4 ++-- fs/btrfs/send.c | 2 +- fs/btrfs/tree-checker.c | 2 +- fs/btrfs/tree-log.c | 18 +++++++++--------- include/uapi/linux/btrfs_tree.h | 7 +++++++ 10 files changed, 43 insertions(+), 27 deletions(-)
fs/btrfs/ctree.h +8 -2
@@ -2103,10 +2103,10 @@ BTRFS_SETGET_FUNCS(root_ref_name_len, struct btrfs_root_ref, name_len, 16);/* struct btrfs_dir_item */ BTRFS_SETGET_FUNCS(dir_data_len, struct btrfs_dir_item, data_len, 16); -BTRFS_SETGET_FUNCS(dir_type, struct btrfs_dir_item, type, 8); +BTRFS_SETGET_FUNCS(dir_flags, struct btrfs_dir_item, type, 8); BTRFS_SETGET_FUNCS(dir_name_len, struct btrfs_dir_item, name_len, 16); BTRFS_SETGET_FUNCS(dir_transid, struct btrfs_dir_item, transid, 64); -BTRFS_SETGET_STACK_FUNCS(stack_dir_type, struct btrfs_dir_item, type, 8); +BTRFS_SETGET_STACK_FUNCS(stack_dir_flags, struct btrfs_dir_item, type, 8); BTRFS_SETGET_STACK_FUNCS(stack_dir_data_len, struct btrfs_dir_item, data_len,16 ); BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item,
@@ -2114,6 +2114,12 @@ BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item, BTRFS_SETGET_STACK_FUNCS(stack_dir_transid, struct btrfs_dir_item, transid,64 ); +static inline u8 btrfs_dir_ftype (const struct extent_buffer *eb, +const struct btrfs_dir_item *item) +{ +return btrfs_dir_flags_to_ftype (btrfs_dir_flags (eb, item)); +} +static inline void btrfs_dir_item_key (const struct extent_buffer *eb,const struct btrfs_dir_item *item,struct btrfs_disk_key *key)
fs/btrfs/delayed-inode.c +3 -3
@@ -1410,7 +1410,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info)int btrfs_insert_delayed_dir_index (struct btrfs_trans_handle *trans,const char *name,int name_len,struct btrfs_inode *dir, -struct btrfs_disk_key *disk_key,u8 type, +struct btrfs_disk_key *disk_key,u8 flags,u64 index) {struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -1442,7 +1442,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,btrfs_set_stack_dir_transid (dir_item, trans->transid);btrfs_set_stack_dir_data_len (dir_item,0 );btrfs_set_stack_dir_name_len (dir_item, name_len); -btrfs_set_stack_dir_type (dir_item, type); +btrfs_set_stack_dir_flags (dir_item, flags);memcpy ((char *)(dir_item +1 ), name, name_len); data_len = delayed_item->data_len +sizeof (struct btrfs_item );
@@ -1760,7 +1760,7 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx, name = (char *)(di +1 ); name_len =btrfs_stack_dir_name_len (di); - d_type =fs_ftype_to_dtype (di->type); + d_type =fs_ftype_to_dtype (btrfs_dir_flags_to_ftype (di->type));btrfs_disk_key_to_cpu (&location, &di->location); over = !dir_emit(ctx, name, name_len,
fs/btrfs/delayed-inode.h +1 -1
@@ -99,7 +99,7 @@ static inline void btrfs_init_delayed_root(int btrfs_insert_delayed_dir_index (struct btrfs_trans_handle *trans,const char *name,int name_len,struct btrfs_inode *dir, -struct btrfs_disk_key *disk_key,u8 type, +struct btrfs_disk_key *disk_key,u8 flags,u64 index); int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
fs/btrfs/dir-item.c +2 -2
@@ -81,7 +81,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, leaf = path->nodes[0 ];btrfs_cpu_key_to_disk (&disk_key, &location);btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item,BTRFS_FT_XATTR ); +btrfs_set_dir_flags (leaf, dir_item,BTRFS_FT_XATTR );btrfs_set_dir_name_len (leaf, dir_item, name_len);btrfs_set_dir_transid (leaf, dir_item, trans->transid);btrfs_set_dir_data_len (leaf, dir_item, data_len);
@@ -140,7 +140,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name, leaf = path->nodes[0 ];btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item, type); +btrfs_set_dir_flags (leaf, dir_item, type);btrfs_set_dir_data_len (leaf, dir_item,0 );btrfs_set_dir_name_len (leaf, dir_item, name_len);btrfs_set_dir_transid (leaf, dir_item, trans->transid);
fs/btrfs/inode.c +9 -6
@@ -5566,7 +5566,7 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry, location->objectid, location->type, location->offset); }if (!ret) - *type =btrfs_dir_type (path->nodes[0 ], di); + *type =btrfs_dir_ftype (path->nodes[0 ], di); out:btrfs_free_path (path);return ret;
@@ -6004,6 +6004,7 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx)btrfs_for_each_slot (root, &key, &found_key, path, ret) {struct dir_entry *entry;struct extent_buffer *leaf = path->nodes[0 ]; +u8 di_flags;if (found_key.objectid != key.objectid)break ;
@@ -6027,13 +6028,15 @@ static int btrfs_real_readdir(struct file *file, struct dir_context *ctx) goto again; } + di_flags =btrfs_dir_flags (leaf, di); entry = addr; -put_unaligned (name_len, &entry->name_len); name_ptr = (char *)(entry +1 ); -read_extent_buffer (leaf, name_ptr, (unsigned long )(di +1 ), - name_len); -put_unaligned (fs_ftype_to_dtype (btrfs_dir_type (leaf, di)), - &entry->type); +read_extent_buffer (leaf, name_ptr, + (unsigned long )(di +1 ), name_len); +put_unaligned (name_len, &entry->name_len); +put_unaligned ( +fs_ftype_to_dtype (btrfs_dir_flags_to_ftype (di_flags)), + &entry->type);btrfs_dir_item_key_to_cpu (leaf, di, &location);put_unaligned (location.objectid, &entry->ino);put_unaligned (found_key.offset, &entry->offset);
fs/btrfs/print-tree.c +2 -2
@@ -240,9 +240,9 @@ void btrfs_print_leaf(struct extent_buffer *l)case BTRFS_DIR_ITEM_KEY : di = btrfs_item_ptr(l, i, struct btrfs_dir_item);btrfs_dir_item_key_to_cpu (l, di, &found_key); -pr_info ("\t\tdir oid %llu type %u\n" , +pr_info ("\t\tdir oid %llu flags %u\n" , found_key.objectid, -btrfs_dir_type (l, di)); +btrfs_dir_flags (l, di));break ;case BTRFS_ROOT_ITEM_KEY : ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
fs/btrfs/send.c +1 -1
@@ -1077,7 +1077,7 @@ static int iterate_dir_item(struct btrfs_root *root, struct btrfs_path *path, data_len =btrfs_dir_data_len (eb, di);btrfs_dir_item_key_to_cpu (eb, di, &di_key); -if (btrfs_dir_type (eb, di) ==BTRFS_FT_XATTR ) { +if (btrfs_dir_ftype (eb, di) ==BTRFS_FT_XATTR ) {if (name_len >XATTR_NAME_MAX ) { ret = -ENAMETOOLONG ; goto out;
fs/btrfs/tree-checker.c +1 -1
@@ -528,7 +528,7 @@ static int check_dir_item(struct extent_buffer *leaf, }/* dir type check */ - dir_type =btrfs_dir_type (leaf, di); + dir_type =btrfs_dir_ftype (leaf, di);if (unlikely (dir_type >=BTRFS_FT_MAX )) { dir_item_err(leaf, slot, "invalid dir item type, have %u expect [0, %u)",
fs/btrfs/tree-log.c +9 -9
@@ -1947,7 +1947,7 @@ static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,struct btrfs_path *path, struct btrfs_dir_item *dst_di, const struct btrfs_key *log_key, - u8 log_type, + u8 log_flags, bool exists) { struct btrfs_key found_key;
@@ -1957,7 +1957,7 @@ static int delete_conflicting_dir_entry(struct btrfs_trans_handle *trans,if (found_key.objectid == log_key->objectid && found_key.type == log_key->type && found_key.offset == log_key->offset && -btrfs_dir_type (path->nodes[0 ], dst_di) == log_type) +btrfs_dir_flags (path->nodes[0 ], dst_di) == log_flags)return 1 ;/*
@@ -2002,7 +2002,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,struct btrfs_key log_key;struct btrfs_key search_key;struct inode *dir; -u8 log_type; +u8 log_flags;bool exists;int ret;bool update_size = true;
@@ -2019,7 +2019,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, goto out; } - log_type =btrfs_dir_type (eb, di); + log_flags =btrfs_dir_flags (eb, di);read_extent_buffer (eb, name, (unsigned long )(di +1 ), name_len);
@@ -2038,8 +2038,8 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, goto out; }else if (dir_dst_di) { ret =delete_conflicting_dir_entry (trans,BTRFS_I (dir), path, - dir_dst_di, &log_key, log_type, - exists); + dir_dst_di, &log_key, + log_flags, exists);if (ret <0 ) goto out; dir_dst_matches = (ret ==1 );
@@ -2056,7 +2056,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, }else if (index_dst_di) { ret =delete_conflicting_dir_entry (trans,BTRFS_I (dir), path, index_dst_di, &log_key, - log_type, exists); + log_flags, exists);if (ret <0 ) goto out; index_dst_matches = (ret ==1 );
@@ -2166,7 +2166,7 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,* to ever delete the parent directory has it would result in stale * dentries that can never be deleted. */ -if (ret ==1 &&btrfs_dir_type (eb, di) !=BTRFS_FT_DIR ) { +if (ret ==1 &&btrfs_dir_ftype (eb, di) !=BTRFS_FT_DIR ) {struct btrfs_path *fixup_path;struct btrfs_key di_key;
@@ -6181,7 +6181,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans, goto next_dir_inode; di = btrfs_item_ptr(leaf, i, struct btrfs_dir_item); - type =btrfs_dir_type (leaf, di); + type =btrfs_dir_ftype (leaf, di);if (btrfs_dir_transid (leaf, di) < trans->transid)continue ;btrfs_dir_item_key_to_cpu (leaf, di, &di_key);
include/uapi/linux/btrfs_tree.h +7 -0
@@ -359,6 +359,13 @@ enum btrfs_csum_type {#define BTRFS_FT_SYMLINK 7#define BTRFS_FT_XATTR 8#define BTRFS_FT_MAX 9 +/* Name is encrypted. */ +#define BTRFS_FT_FSCRYPT_NAME 0x80 + +static inline __u8 btrfs_dir_flags_to_ftype (__u8 flags) +{ +return flags & ~BTRFS_FT_FSCRYPT_NAME ; +}/* * The key defines the order in the tree, and so it also defines (optimal)
Signature · 1 line
2.35.1
RFC PATCH v2 3/16 btrfs: setup fscrypt_names from dentrys using helper
In reply to Sweet Tea DorminyMost places that we create fscrypt_names, we are doing so from a dentry. Fscrypt provides a helper for this common pattern:fscrypt_setup_filename() initializes a filename to search for from a dentry, performing encryption of the plaintext if it can and should be done. This converts each setup of a fscrypt_name from a dentry to use this helper; at present, since there are no encrypted directories, nothing goes down the filename encryption paths.
--- fs/btrfs/inode.c | 153 ++++++++++++++++++++++++++--------------- fs/btrfs/transaction.c | 26 +++++-- fs/btrfs/tree-log.c | 12 ++-- 3 files changed, 123 insertions(+), 68 deletions(-)
fs/btrfs/inode.c +96 -57
@@ -4406,14 +4406,17 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry)struct btrfs_trans_handle *trans;struct inode *inode =d_inode (dentry);int ret; -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((unsigned char *)dentry->d_name.name, dentry->d_name.len) - }; +struct fscrypt_name fname; + ret =fscrypt_setup_filename (dir, &dentry->d_name,1 , &fname); +if (ret) +return ret; trans =__unlink_start_trans (dir); -if (IS_ERR (trans)) -return PTR_ERR (trans); +if (IS_ERR (trans)) { + ret =PTR_ERR (trans); + goto out; + }btrfs_record_unlink_dir (trans,BTRFS_I (dir),BTRFS_I (d_inode (dentry)),0 );
@@ -4430,6 +4433,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) } out: +fscrypt_free_filename (&fname);btrfs_end_transaction (trans);btrfs_btree_balance_dirty (BTRFS_I (dir)->root->fs_info);return ret;
@@ -4448,10 +4452,11 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,int ret;u64 objectid;u64 dir_ino =btrfs_ino (BTRFS_I (dir)); -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((char *) dentry->d_name.name, - dentry->d_name.len) - }; +struct fscrypt_name fname; + + ret =fscrypt_setup_filename (dir, &dentry->d_name,1 , &fname); +if (ret) +return ret;if (btrfs_ino (inode) ==BTRFS_FIRST_FREE_OBJECTID ) { objectid = inode->root->root_key.objectid;
@@ -4459,12 +4464,15 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, objectid = inode->location.objectid; }else {WARN_ON (1 ); +fscrypt_free_filename (&fname);return -EINVAL ; } path =btrfs_alloc_path (); -if (!path) -return -ENOMEM ; +if (!path) { + ret = -ENOMEM ; + goto out; + } di =btrfs_lookup_dir_item (trans, root, path, dir_ino, &fname,-1 );if (IS_ERR_OR_NULL (di)) {
@@ -4531,6 +4539,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,btrfs_abort_transaction (trans, ret); out:btrfs_free_path (path); +fscrypt_free_filename (&fname);return ret; }
@@ -4797,9 +4806,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)int err =0 ;struct btrfs_trans_handle *trans;u64 last_unlink_trans; -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((unsigned char *)dentry->d_name.name, dentry->d_name.len) - }; +struct fscrypt_name fname;if (inode->i_size >BTRFS_EMPTY_DIR_SIZE )return -ENOTEMPTY ;
@@ -4812,9 +4819,15 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)return btrfs_delete_subvolume (dir, dentry); } + err =fscrypt_setup_filename (dir, &dentry->d_name,1 , &fname); +if (err) +return err; + trans =__unlink_start_trans (dir); -if (IS_ERR (trans)) -return PTR_ERR (trans); +if (IS_ERR (trans)) { + err =PTR_ERR (trans); + goto out_notrans; + }if (unlikely (btrfs_ino (BTRFS_I (inode)) ==BTRFS_EMPTY_SUBVOL_DIR_OBJECTID )) { err =btrfs_unlink_subvol (trans, dir, dentry);
@@ -4848,7 +4861,9 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) } out:btrfs_end_transaction (trans); +out_notrans:btrfs_btree_balance_dirty (fs_info); +fscrypt_free_filename (&fname);return err; }
@@ -5543,7 +5558,7 @@ void btrfs_evict_inode(struct inode *inode)/* * Return the key found in the dir entry in the location pointer, fill @type -* with BTRFS_FT_*, and return 0. +* with BTRFS_FT_*, and return 0. Used only for lookups, not removals. * * If no dir entries were found, returns -ENOENT. * If found a corrupted location in dir entry, returns -EUCLEAN.
@@ -5555,15 +5570,16 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,struct btrfs_path *path;struct btrfs_root *root =BTRFS_I (dir)->root;int ret =0 ; -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((char *) dentry->d_name.name, - dentry->d_name.len) - }; +struct fscrypt_name fname; path =btrfs_alloc_path ();if (!path)return -ENOMEM ; + ret =fscrypt_setup_filename (dir, &dentry->d_name,1 , &fname); +if (ret) + goto out; + di =btrfs_lookup_dir_item (NULL , root, path,btrfs_ino (BTRFS_I (dir)), &fname,0 );if (IS_ERR_OR_NULL (di)) {
@@ -5583,6 +5599,7 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,if (!ret) *type =btrfs_dir_ftype (path->nodes[0 ], di); out: +fscrypt_free_filename (&fname);btrfs_free_path (path);return ret; }
@@ -5603,9 +5620,15 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info,struct btrfs_root_ref *ref;struct extent_buffer *leaf;struct btrfs_key key; +struct fscrypt_name fname;int ret;int err =0 ; + ret =fscrypt_setup_filename (dir, &dentry->d_name,0 , + &fname); +if (ret) +return ret; + path =btrfs_alloc_path ();if (!path) { err = -ENOMEM ;
@@ -5651,6 +5674,7 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info, err =0 ; out:btrfs_free_path (path); +fscrypt_free_filename (&fname);return err; }
@@ -6257,16 +6281,17 @@ int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args,struct inode *inode = args->inode;int ret; +if (!args->orphan) { + ret =fscrypt_setup_filename (dir, &args->dentry->d_name,0 , + &args->fname); +if (ret) +return ret; + } + ret =posix_acl_create (dir, &inode->i_mode, &args->default_acl, &args->acl); -if (ret) +if (ret) { +fscrypt_free_filename (&args->fname);return ret; - -if (!args->orphan) { -char *name = (char *) args->dentry->d_name.name; -int name_len = args->dentry->d_name.len; - args->fname = (struct fscrypt_name ) { - .disk_name =FSTR_INIT (name, name_len), - }; }/* 1 to add inode item */
@@ -6307,6 +6332,7 @@ void btrfs_new_inode_args_destroy(struct btrfs_new_inode_args *args) {posix_acl_release (args->acl);posix_acl_release (args->default_acl); +fscrypt_free_filename (&args->fname); }/*
@@ -6734,10 +6760,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,struct btrfs_root *root =BTRFS_I (dir)->root;struct inode *inode =d_inode (old_dentry);struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((char *) dentry->d_name.name, - dentry->d_name.len) - }; +struct fscrypt_name fname;u64 index;int err;int drop_inode =0 ;
@@ -6749,6 +6772,10 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,if (inode->i_nlink >=BTRFS_LINK_MAX )return -EMLINK ; + err =fscrypt_setup_filename (dir, &dentry->d_name,0 , &fname); +if (err) + goto fail; + err =btrfs_set_inode_index (BTRFS_I (dir), &index);if (err) goto fail;
@@ -6799,6 +6826,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, } fail: +fscrypt_free_filename (&fname);if (trans)btrfs_end_transaction (trans);if (drop_inode) {
@@ -9169,14 +9197,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,int ret;int ret2;bool need_abort = false; -struct fscrypt_name old_name = { - .disk_name =FSTR_INIT ((char *) old_dentry->d_name.name, - old_dentry->d_name.len) - }; -struct fscrypt_name new_name = { - .disk_name =FSTR_INIT ((char *) new_dentry->d_name.name, - new_dentry->d_name.len) - }; +struct fscrypt_name old_fname, new_fname;/* * For non-subvolumes allow exchange only within one subvolume, in the
@@ -9188,6 +9209,16 @@ static int btrfs_rename_exchange(struct inode *old_dir, new_ino != BTRFS_FIRST_FREE_OBJECTID))return -EXDEV ; + ret =fscrypt_setup_filename (old_dir, &old_dentry->d_name,0 , &old_fname); +if (ret) +return ret; + + ret =fscrypt_setup_filename (new_dir, &new_dentry->d_name,0 , &new_fname); +if (ret) { +fscrypt_free_filename (&old_fname); +return ret; + } +/* close the race window with snapshot create/destroy ioctl */ if (old_ino ==BTRFS_FIRST_FREE_OBJECTID || new_ino ==BTRFS_FIRST_FREE_OBJECTID )
@@ -9255,7 +9286,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,/* force full log commit if subvolume involved. */ btrfs_set_log_full_commit (trans); }else { - ret =btrfs_insert_inode_ref (trans, dest, &new_name, old_ino, + ret =btrfs_insert_inode_ref (trans, dest, &new_fname, old_ino,btrfs_ino (BTRFS_I (new_dir)), old_idx);if (ret)
@@ -9268,7 +9299,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,/* force full log commit if subvolume involved. */ btrfs_set_log_full_commit (trans); }else { - ret =btrfs_insert_inode_ref (trans, root, &old_name, new_ino, + ret =btrfs_insert_inode_ref (trans, root, &old_fname, new_ino,btrfs_ino (BTRFS_I (old_dir)), new_idx);if (ret) {
@@ -9302,7 +9333,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, ret =btrfs_unlink_subvol (trans, old_dir, old_dentry); }else {/* src is an inode */ ret =__btrfs_unlink_inode (trans,BTRFS_I (old_dir), -BTRFS_I (old_dentry->d_inode), &old_name, +BTRFS_I (old_dentry->d_inode), &old_fname, &old_rename_ctx);if (!ret) ret =btrfs_update_inode (trans, root,BTRFS_I (old_inode));
@@ -9317,7 +9348,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, ret =btrfs_unlink_subvol (trans, new_dir, new_dentry); }else {/* dest is an inode */ ret =__btrfs_unlink_inode (trans,BTRFS_I (new_dir), -BTRFS_I (new_dentry->d_inode), &new_name, +BTRFS_I (new_dentry->d_inode), &new_fname, &new_rename_ctx);if (!ret) ret =btrfs_update_inode (trans, dest,BTRFS_I (new_inode));
@@ -9328,14 +9359,14 @@ static int btrfs_rename_exchange(struct inode *old_dir, } ret =btrfs_add_link (trans,BTRFS_I (new_dir),BTRFS_I (old_inode), - &new_name,0 , old_idx); + &new_fname,0 , old_idx);if (ret) {btrfs_abort_transaction (trans, ret); goto out_fail; } ret =btrfs_add_link (trans,BTRFS_I (old_dir),BTRFS_I (new_inode), - &old_name,0 , new_idx); + &old_fname,0 , new_idx);if (ret) {btrfs_abort_transaction (trans, ret); goto out_fail;
@@ -9378,6 +9409,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, old_ino == BTRFS_FIRST_FREE_OBJECTID)up_read (&fs_info->subvol_sem); +fscrypt_free_filename (&new_fname); +fscrypt_free_filename (&old_fname);return ret; }
@@ -9417,14 +9450,7 @@ static int btrfs_rename(struct user_namespace *mnt_userns,int ret;int ret2;u64 old_ino =btrfs_ino (BTRFS_I (old_inode)); -struct fscrypt_name old_fname = { - .disk_name =FSTR_INIT ((char *)old_dentry->d_name.name, - old_dentry->d_name.len) - }; -struct fscrypt_name new_fname = { - .disk_name =FSTR_INIT ((char *)new_dentry->d_name.name, - new_dentry->d_name.len) - }; +struct fscrypt_name old_fname, new_fname;if (btrfs_ino (BTRFS_I (new_dir)) ==BTRFS_EMPTY_SUBVOL_DIR_OBJECTID )return -EPERM ;
@@ -9441,6 +9467,16 @@ static int btrfs_rename(struct user_namespace *mnt_userns, new_inode->i_size > BTRFS_EMPTY_DIR_SIZE)return -ENOTEMPTY ; + ret =fscrypt_setup_filename (old_dir, &old_dentry->d_name,0 , &old_fname); +if (ret) +return ret; + + ret =fscrypt_setup_filename (new_dir, &new_dentry->d_name,0 , &new_fname); +if (ret) { +fscrypt_free_filename (&old_fname); +return ret; + } +/* check for collisions, even if the name isn't there */ ret =btrfs_check_dir_item_collision (dest, new_dir->i_ino, &new_fname);
@@ -9449,11 +9485,11 @@ static int btrfs_rename(struct user_namespace *mnt_userns,/* we shouldn't get * eexist without a new_inode */ if (WARN_ON (!new_inode)) { -return ret; + goto out_fscrypt_names; } }else {/* maybe -EOVERFLOW */ -return ret; + goto out_fscrypt_names; } } ret =0 ;
@@ -9627,6 +9663,9 @@ static int btrfs_rename(struct user_namespace *mnt_userns, out_whiteout_inode:if (flags &RENAME_WHITEOUT )iput (whiteout_args.inode); +out_fscrypt_names: +fscrypt_free_filename (&old_fname); +fscrypt_free_filename (&new_fname);return ret; }
fs/btrfs/transaction.c +20 -6
@@ -6,6 +6,7 @@#include <linux/fs.h> #include <linux/slab.h> #include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/writeback.h> #include <linux/pagemap.h> #include <linux/blkdev.h>
@@ -1637,10 +1638,8 @@ create_pending_snapshot(struct btrfs_trans_handle *trans,u64 index =0 ;u64 objectid;u64 root_flags; -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((char *) pending->dentry->d_name.name, - pending->dentry->d_name.len) - }; +unsigned int mem_flags; +struct fscrypt_name fname;ASSERT (pending->path); path = pending->path;
@@ -1648,9 +1647,22 @@ create_pending_snapshot(struct btrfs_trans_handle *trans,ASSERT (pending->root_item); new_root_item = pending->root_item; +/* +* Since this is during btrfs_commit_transaction() and more items +* joining the transaction at this point would be bad, use NOFS +* allocations so that no new writes are kicked off. +*/ + mem_flags =memalloc_nofs_save (); + pending->error =fscrypt_setup_filename (parent_inode, + &pending->dentry->d_name,0 , + &fname); +memalloc_nofs_restore (mem_flags); +if (pending->error) + goto free_pending; + pending->error =btrfs_get_free_objectid (tree_root, &objectid);if (pending->error) - goto no_free_objectid; + goto free_fname;/* * Make qgroup to skip current new snapshot's qgroupid, as it is
@@ -1864,7 +1876,9 @@ create_pending_snapshot(struct btrfs_trans_handle *trans, trans->bytes_reserved =0 ; clear_skip_qgroup:btrfs_clear_skip_qgroup (trans); -no_free_objectid: +free_fname: +fscrypt_free_filename (&fname); +free_pending:kfree (new_root_item); pending->root_item =NULL ;btrfs_free_path (path);
fs/btrfs/tree-log.c +7 -5
@@ -7042,13 +7042,13 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,if (old_dir && old_dir->logged_trans == trans->transid) {struct btrfs_root *log = old_dir->root->log_root;struct btrfs_path *path; -struct fscrypt_name fname = { - .disk_name =FSTR_INIT ((char *) old_dentry->d_name.name, - old_dentry->d_name.len) - }; - +struct fscrypt_name fname;ASSERT (old_dir_index >=BTRFS_DIR_START_INDEX ); + ret =fscrypt_setup_filename (&old_dir->vfs_inode, + &old_dentry->d_name,0 , &fname); +if (ret) + goto out;/* * We have two inodes to update in the log, the old directory and * the inode that got renamed, so we must pin the log to prevent
@@ -7068,6 +7068,7 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans, path =btrfs_alloc_path ();if (!path) { ret = -ENOMEM ; +fscrypt_free_filename (&fname); goto out; }
@@ -7097,6 +7098,7 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,mutex_unlock (&old_dir->log_mutex);btrfs_free_path (path); +fscrypt_free_filename (&fname);if (ret <0 ) goto out; }
Signature · 1 line
2.35.1
RFC PATCH v2 2/16 btrfs: use fscrypt_name's instead of name/len everywhere.
In reply to Sweet Tea DorminyFor encryption, the plaintext filenames provided by the VFS will need to be translated to ciphertext filenames on disk. Fscrypt provides a struct to encapsulate a potentially encrypted filename, struct fscrypt_name. This change converts every (name, len) pair to be a struct fscrypt_name, statically initialized, for ease of review and uniformity.
--- fs/btrfs/ctree.h | 49 +++++---- fs/btrfs/delayed-inode.c | 12 +- fs/btrfs/delayed-inode.h | 3 +- fs/btrfs/dir-item.c | 87 +++++++-------- fs/btrfs/inode-item.c | 82 +++++++------- fs/btrfs/inode-item.h | 14 +-- fs/btrfs/inode.c | 197 ++++++++++++++++++--------------- fs/btrfs/ioctl.c | 29 +++-- fs/btrfs/props.c | 11 +- fs/btrfs/root-tree.c | 19 ++-- fs/btrfs/send.c | 139 ++++++++++++++--------- fs/btrfs/super.c | 5 +- fs/btrfs/transaction.c | 25 +++-- fs/btrfs/tree-checker.c | 6 +- fs/btrfs/tree-log.c | 230 ++++++++++++++++++++++----------------- fs/btrfs/tree-log.h | 4 +- fs/btrfs/xattr.c | 21 ++-- 17 files changed, 531 insertions(+), 402 deletions(-)
fs/btrfs/ctree.h +27 -22
@@ -21,11 +21,13 @@#include <linux/pagemap.h> #include <linux/btrfs.h> #include <linux/btrfs_tree.h> +#include <linux/fscrypt.h> #include <linux/workqueue.h> #include <linux/security.h> #include <linux/sizes.h> #include <linux/dynamic_debug.h> #include <linux/refcount.h> +#include <linux/crc32.h> #include <linux/crc32c.h> #include <linux/iomap.h> #include "extent-io-tree.h"
@@ -2735,18 +2737,19 @@ static inline void btrfs_crc32c_final(u32 crc, u8 *result)put_unaligned_le32 (~crc, result); } -static inline u64 btrfs_name_hash (const char *name,int len) +static inline u64 btrfs_name_hash (const struct fscrypt_name *name) { -return crc32c ((u32 )~1 , name, len); +return crc32c ((u32 )~1 ,fname_name (name),fname_len (name)); }/* * Figure the key offset of an extended inode ref */ -static inline u64 btrfs_extref_hash (u64 parent_objectid,const char *name, -int len) +static inline u64 btrfs_extref_hash (u64 parent_objectid, +const struct fscrypt_name *name) { -return (u64 )crc32c (parent_objectid, name, len); +return (u64 )crc32c (parent_objectid,fname_name (name), +fname_len (name)); }static inline gfp_t btrfs_alloc_write_mask (struct address_space *mapping)
@@ -3182,11 +3185,11 @@ static inline void btrfs_clear_sb_rdonly(struct super_block *sb)/* root-item.c */ int btrfs_add_root_ref (struct btrfs_trans_handle *trans,u64 root_id, -u64 ref_id,u64 dirid,u64 sequence,const char *name, -int name_len); +u64 ref_id,u64 dirid,u64 sequence, +const struct fscrypt_name *fname);int btrfs_del_root_ref (struct btrfs_trans_handle *trans,u64 root_id, -u64 ref_id,u64 dirid,u64 *sequence,const char *name, -int name_len); +u64 ref_id,u64 dirid,u64 *sequence, +const struct fscrypt_name *fname);int btrfs_del_root (struct btrfs_trans_handle *trans,const struct btrfs_key *key); int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -3215,25 +3218,26 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info);/* dir-item.c */ int btrfs_check_dir_item_collision (struct btrfs_root *root,u64 dir, -const char *name,int name_len); -int btrfs_insert_dir_item (struct btrfs_trans_handle *trans,const char *name, -int name_len,struct btrfs_inode *dir, -struct btrfs_key *location,u8 type,u64 index); +const struct fscrypt_name *fname); +int btrfs_insert_dir_item (struct btrfs_trans_handle *trans, +const struct fscrypt_name *fname, +struct btrfs_inode *dir,struct btrfs_key *location, +u8 type,u64 index);struct btrfs_dir_item *btrfs_lookup_dir_item (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_path *path,u64 dir, -const char *name,int name_len, +const struct fscrypt_name *fname,int mod);struct btrfs_dir_item *btrfs_lookup_dir_index_item (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_path *path,u64 dir, -u64 index,const char *name,int name_len, +u64 index,const struct fscrypt_name *fname,int mod);struct btrfs_dir_item *btrfs_search_dir_index_item (struct btrfs_root *root,struct btrfs_path *path,u64 dirid, -const char *name,int name_len); +const struct fscrypt_name *fname); int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path,
@@ -3241,17 +3245,16 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,int btrfs_insert_xattr_item (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_path *path,u64 objectid, -const char *name,u16 name_len, +const struct fscrypt_name *fname,const void *data,u16 data_len);struct btrfs_dir_item *btrfs_lookup_xattr (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_path *path,u64 dir, -const char *name,u16 name_len, +const struct fscrypt_name *fname,int mod);struct btrfs_dir_item *btrfs_match_dir_item_name (struct btrfs_fs_info *fs_info,struct btrfs_path *path, -const char *name, -int name_len); +const struct fscrypt_name *name);/* orphan.c */ int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,
@@ -3315,10 +3318,11 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);int btrfs_set_inode_index (struct btrfs_inode *dir,u64 *index);int btrfs_unlink_inode (struct btrfs_trans_handle *trans,struct btrfs_inode *dir,struct btrfs_inode *inode, -const char *name,int name_len); +const struct fscrypt_name *fname);int btrfs_add_link (struct btrfs_trans_handle *trans,struct btrfs_inode *parent_inode,struct btrfs_inode *inode, -const char *name,int name_len,int add_backref,u64 index); +const struct fscrypt_name *fname,int add_backref, +u64 index);int btrfs_delete_subvolume (struct inode *dir,struct dentry *dentry);int btrfs_truncate_block (struct btrfs_inode *inode,loff_t from,loff_t len,int front);
@@ -3334,6 +3338,7 @@ struct btrfs_new_inode_args {struct inode *dir;struct dentry *dentry;struct inode *inode; +struct fscrypt_name fname;bool orphan;bool subvol;
fs/btrfs/delayed-inode.c +7 -5
@@ -1408,7 +1408,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info)/* Will return 0 or -ENOMEM */ int btrfs_insert_delayed_dir_index (struct btrfs_trans_handle *trans, -const char *name,int name_len, +const struct fscrypt_name *fname,struct btrfs_inode *dir,struct btrfs_disk_key *disk_key,u8 flags,u64 index)
@@ -1426,7 +1426,8 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,if (IS_ERR (delayed_node))return PTR_ERR (delayed_node); - delayed_item =btrfs_alloc_delayed_item (sizeof (*dir_item) + name_len); + delayed_item =btrfs_alloc_delayed_item (sizeof (*dir_item) + +fname_len (fname));if (!delayed_item) { ret = -ENOMEM ; goto release_node;
@@ -1441,9 +1442,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, dir_item->location = *disk_key;btrfs_set_stack_dir_transid (dir_item, trans->transid);btrfs_set_stack_dir_data_len (dir_item,0 ); -btrfs_set_stack_dir_name_len (dir_item, name_len); +btrfs_set_stack_dir_name_len (dir_item,fname_len (fname));btrfs_set_stack_dir_flags (dir_item, flags); -memcpy ((char *)(dir_item +1 ), name, name_len); +memcpy ((char *)(dir_item +1 ),fname_name (fname),fname_len (fname)); data_len = delayed_item->data_len +sizeof (struct btrfs_item );
@@ -1494,7 +1495,8 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,if (unlikely (ret)) {btrfs_err (trans->fs_info,"err add delayed dir index item(name: %.*s) into the insertion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)" , - name_len, name, delayed_node->root->root_key.objectid, +fname_len (fname),fname_name (fname), + delayed_node->root->root_key.objectid, delayed_node->inode_id, ret);BUG (); }
fs/btrfs/delayed-inode.h +2 -1
@@ -13,6 +13,7 @@#include <linux/list.h> #include <linux/wait.h> #include <linux/atomic.h> +#include <linux/fscrypt.h> #include <linux/refcount.h> #include "ctree.h"
@@ -97,7 +98,7 @@ static inline void btrfs_init_delayed_root( }int btrfs_insert_delayed_dir_index (struct btrfs_trans_handle *trans, -const char *name,int name_len, +const struct fscrypt_name *fname,struct btrfs_inode *dir,struct btrfs_disk_key *disk_key,u8 flags,u64 index);
fs/btrfs/dir-item.c +44 -43
260 lines not on this page · raw message
fs/btrfs/inode-item.c +44 -38
261 lines not on this page · raw message
fs/btrfs/inode-item.h +7 -7
@@ -65,11 +65,11 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, struct btrfs_truncate_control *control);int btrfs_insert_inode_ref (struct btrfs_trans_handle *trans,struct btrfs_root *root, -const char *name,int name_len, +const struct fscrypt_name *fname,u64 inode_objectid,u64 ref_objectid,u64 index);int btrfs_del_inode_ref (struct btrfs_trans_handle *trans,struct btrfs_root *root, -const char *name,int name_len, +const struct fscrypt_name *fname,u64 inode_objectid,u64 ref_objectid,u64 *index); int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -82,15 +82,15 @@ struct btrfs_inode_extref *btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, - const char *name, int name_len, + const struct fscrypt_name *fname, u64 inode_objectid, u64 ref_objectid, int ins_len, int cow); -struct btrfs_inode_ref *btrfs_find_name_in_backref (struct extent_buffer *leaf, -int slot,const char *name, -int name_len); +struct btrfs_inode_ref * +btrfs_find_name_in_backref (struct extent_buffer *leaf,int slot, +const struct fscrypt_name *fname);struct btrfs_inode_extref *btrfs_find_name_in_ext_backref (struct extent_buffer *leaf,int slot,u64 ref_objectid, -const char *name,int name_len); +const struct fscrypt_name *fname);#endif
fs/btrfs/inode.c +111 -86
499 lines not on this page · raw message
fs/btrfs/ioctl.c +18 -11
@@ -941,7 +941,7 @@ static inline int btrfs_may_create(struct user_namespace *mnt_userns,*/ static noinline int btrfs_mksubvol(const struct path *parent,struct user_namespace *mnt_userns, -const char *name,int namelen, +struct fscrypt_name *fname,struct btrfs_root *snap_src,bool readonly,struct btrfs_qgroup_inherit *inherit)
@@ -955,7 +955,8 @@ static noinline int btrfs_mksubvol(const struct path *parent,if (error == -EINTR )return error; - dentry =lookup_one (mnt_userns, name, parent->dentry, namelen); + dentry =lookup_one (mnt_userns,fname_name (fname), parent->dentry, +fname_len (fname)); error =PTR_ERR (dentry);if (IS_ERR (dentry)) goto out_unlock;
@@ -969,8 +970,7 @@ static noinline int btrfs_mksubvol(const struct path *parent,* check for them now when we can safely fail */ error =btrfs_check_dir_item_collision (BTRFS_I (dir)->root, - dir->i_ino, name, - namelen); + dir->i_ino, fname);if (error) goto out_dput;
@@ -997,7 +997,7 @@ static noinline int btrfs_mksubvol(const struct path *parent, static noinline int btrfs_mksnapshot(const struct path *parent,struct user_namespace *mnt_userns, -const char *name,int namelen, +struct fscrypt_name *fname,struct btrfs_root *root,bool readonly,struct btrfs_qgroup_inherit *inherit)
@@ -1026,7 +1026,7 @@ static noinline int btrfs_mksnapshot(const struct path *parent,btrfs_wait_ordered_extents (root,U64_MAX ,0 , (u64)-1 ); - ret =btrfs_mksubvol (parent, mnt_userns, name, namelen, + ret =btrfs_mksubvol (parent, mnt_userns, fname, root, readonly, inherit); out:if (snapshot_force_cow)
@@ -2138,6 +2138,7 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, {int namelen;int ret =0 ; +struct fscrypt_name fname;if (!S_ISDIR (file_inode (file)->i_mode))return -ENOTDIR ;
@@ -2158,9 +2159,12 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, goto out_drop_write; } + fname = (struct fscrypt_name ) { + .disk_name =FSTR_INIT ((char *) name, namelen) + };if (subvol) { - ret =btrfs_mksubvol (&file->f_path, mnt_userns, name, - namelen,NULL , readonly, inherit); + ret =btrfs_mksubvol (&file->f_path, mnt_userns, &fname, +NULL , readonly, inherit); }else {struct fd src =fdget (fd);struct inode *src_inode;
@@ -2182,8 +2186,7 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, ret = -EPERM ; }else { ret =btrfs_mksnapshot (&file->f_path, mnt_userns, - name, namelen, -BTRFS_I (src_inode)->root, + &fname,BTRFS_I (src_inode)->root, readonly, inherit); }fdput (src);
@@ -3777,6 +3780,10 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)u64 objectid =0 ;u64 dir_id;int ret; +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ("default" ,7 ) + }; +if (!capable (CAP_SYS_ADMIN ))return -EPERM ;
@@ -3817,7 +3824,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) dir_id =btrfs_super_root_dir (fs_info->super_copy); di =btrfs_lookup_dir_item (trans, fs_info->tree_root, path, - dir_id,"default" ,7 ,1 ); + dir_id, &fname,1 );if (IS_ERR_OR_NULL (di)) {btrfs_release_path (path);btrfs_end_transaction (trans);
fs/btrfs/props.c +9 -2
@@ -43,7 +43,10 @@ find_prop_handler(const char *name,struct prop_handler *h;if (!handlers) { -u64 hash =btrfs_name_hash (name,strlen (name)); +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ((char *) name,strlen (name)), + }; +u64 hash =btrfs_name_hash (&fname); handlers =find_prop_handlers_by_hash (hash);if (!handlers)
@@ -462,7 +465,11 @@ void __init btrfs_props_init(void)for (i =0 ; i <ARRAY_SIZE (prop_handlers); i++) {struct prop_handler *p = &prop_handlers[i]; -u64 h =btrfs_name_hash (p->xattr_name,strlen (p->xattr_name)); +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ((char *)p->xattr_name, +strlen (p->xattr_name)), + }; +u64 h =btrfs_name_hash (&fname);hash_add (prop_handlers_ht, &p->node, h); }
fs/btrfs/root-tree.c +10 -9
@@ -327,8 +327,8 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, }int btrfs_del_root_ref (struct btrfs_trans_handle *trans,u64 root_id, -u64 ref_id,u64 dirid,u64 *sequence,const char *name, -int name_len) +u64 ref_id,u64 dirid,u64 *sequence, +const struct fscrypt_name *fname) {struct btrfs_root *tree_root = trans->fs_info->tree_root;
@@ -357,8 +357,9 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, struct btrfs_root_ref); ptr = (unsigned long )(ref +1 );if ((btrfs_root_ref_dirid (leaf, ref) != dirid) || - (btrfs_root_ref_name_len (leaf, ref) != name_len) || -memcmp_extent_buffer (leaf, name, ptr, name_len)) { + (btrfs_root_ref_name_len (leaf, ref) !=fname_len (fname)) || +memcmp_extent_buffer (leaf,fname_name (fname), ptr, +fname_len (fname))) { err = -ENOENT ; goto out; }
@@ -401,8 +402,8 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,* Will return 0, -ENOMEM, or anything from the CoW path */ int btrfs_add_root_ref (struct btrfs_trans_handle *trans,u64 root_id, -u64 ref_id,u64 dirid,u64 sequence,const char *name, -int name_len) +u64 ref_id,u64 dirid,u64 sequence, +const struct fscrypt_name *fname) {struct btrfs_root *tree_root = trans->fs_info->tree_root;struct btrfs_key key;
@@ -421,7 +422,7 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id, key.offset = ref_id; again: ret =btrfs_insert_empty_item (trans, tree_root, path, &key, -sizeof (*ref) + name_len); +sizeof (*ref) +fname_len (fname));if (ret) {btrfs_abort_transaction (trans, ret);btrfs_free_path (path);
@@ -432,9 +433,9 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id, ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref);btrfs_set_root_ref_dirid (leaf, ref, dirid);btrfs_set_root_ref_sequence (leaf, ref, sequence); -btrfs_set_root_ref_name_len (leaf, ref, name_len); +btrfs_set_root_ref_name_len (leaf, ref,fname_len (fname)); ptr = (unsigned long )(ref +1 ); -write_extent_buffer (leaf, name, ptr, name_len); +write_extent_buffer (leaf,fname_name (fname), ptr,fname_len (fname));btrfs_mark_buffer_dirty (leaf);if (key.type ==BTRFS_ROOT_BACKREF_KEY ) {
fs/btrfs/send.c +85 -54
436 lines not on this page · raw message
fs/btrfs/super.c +4 -1
@@ -1390,6 +1390,9 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objecstruct btrfs_path *path;struct btrfs_key location;u64 dir_id; +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ("default" ,7 ), + }; path =btrfs_alloc_path ();if (!path)
@@ -1401,7 +1404,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec* to mount. */ dir_id =btrfs_super_root_dir (fs_info->super_copy); - di =btrfs_lookup_dir_item (NULL , root, path, dir_id,"default" ,7 ,0 ); + di =btrfs_lookup_dir_item (NULL , root, path, dir_id, &fname,0 );if (IS_ERR (di)) {btrfs_free_path (path);return PTR_ERR (di);
fs/btrfs/transaction.c +13 -12
@@ -1614,8 +1614,9 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,* happens, we should return the error number. If the error which just affect * the creation of the pending snapshots, just return 0. */ -static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, -struct btrfs_pending_snapshot *pending) +static noinline int +create_pending_snapshot (struct btrfs_trans_handle *trans, +struct btrfs_pending_snapshot *pending) {struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -1625,10 +1626,9 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,struct btrfs_root *root = pending->root;struct btrfs_root *parent_root;struct btrfs_block_rsv *rsv; -struct inode *parent_inode; +struct inode *parent_inode = pending->dir;struct btrfs_path *path;struct btrfs_dir_item *dir_item; -struct dentry *dentry;struct extent_buffer *tmp;struct extent_buffer *old;struct timespec64 cur_time;
@@ -1637,6 +1637,10 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,u64 index =0 ;u64 objectid;u64 root_flags; +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ((char *) pending->dentry->d_name.name, + pending->dentry->d_name.len) + };ASSERT (pending->path); path = pending->path;
@@ -1675,7 +1679,6 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,trace_btrfs_space_reservation (fs_info,"transaction" , trans->transid, trans->bytes_reserved,1 ); - dentry = pending->dentry; parent_inode = pending->dir; parent_root =BTRFS_I (parent_inode)->root; ret =record_root_in_trans (trans, parent_root,0 );
@@ -1692,8 +1695,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,/* check if there is a file/dir which has the same name. */ dir_item =btrfs_lookup_dir_item (NULL , parent_root, path,btrfs_ino (BTRFS_I (parent_inode)), - dentry->d_name.name, - dentry->d_name.len,0 ); + &fname,0 );if (dir_item !=NULL && !IS_ERR (dir_item)) { pending->error = -EEXIST ; goto dir_item_existed;
@@ -1788,7 +1790,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, ret =btrfs_add_root_ref (trans, objectid, parent_root->root_key.objectid,btrfs_ino (BTRFS_I (parent_inode)), index, - dentry->d_name.name, dentry->d_name.len); + &fname);if (ret) {btrfs_abort_transaction (trans, ret); goto fail;
@@ -1820,8 +1822,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,if (ret <0 ) goto fail; - ret =btrfs_insert_dir_item (trans, dentry->d_name.name, - dentry->d_name.len,BTRFS_I (parent_inode), + ret =btrfs_insert_dir_item (trans, &fname,BTRFS_I (parent_inode), &key,BTRFS_FT_DIR , index);/* We have check then name at the beginning, so it is impossible. */ BUG_ON (ret == -EEXIST || ret == -EOVERFLOW );
@@ -1830,8 +1831,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, goto fail; } -btrfs_i_size_write (BTRFS_I (parent_inode), parent_inode->i_size + - dentry->d_name.len *2 ); +btrfs_i_size_write (BTRFS_I (parent_inode), + parent_inode->i_size +fname_len (&fname) *2 ); parent_inode->i_mtime =current_time (parent_inode); parent_inode->i_ctime = parent_inode->i_mtime; ret =btrfs_update_inode_fallback (trans, parent_root,BTRFS_I (parent_inode));
fs/btrfs/tree-checker.c +5 -1
@@ -595,10 +595,14 @@ static int check_dir_item(struct extent_buffer *leaf,if (key->type ==BTRFS_DIR_ITEM_KEY || key->type ==BTRFS_XATTR_ITEM_KEY ) {char namebuf[max (BTRFS_NAME_LEN ,XATTR_NAME_MAX )]; +struct fscrypt_name fname;read_extent_buffer (leaf, namebuf, (unsigned long )(di +1 ), name_len); - name_hash =btrfs_name_hash (namebuf, name_len); + fname = (struct fscrypt_name ) { + .disk_name =FSTR_INIT (namebuf, name_len) + }; + name_hash =btrfs_name_hash (&fname);if (unlikely (key->offset != name_hash)) { dir_item_err(leaf, slot, "name hash mismatch with key, have 0x%016x expect 0x%016llx",
fs/btrfs/tree-log.c +129 -101
676 lines not on this page · raw message
fs/btrfs/tree-log.h +2 -2
@@ -78,11 +78,11 @@ int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans, struct btrfs_log_ctx *ctx);void btrfs_del_dir_entries_in_log (struct btrfs_trans_handle *trans,struct btrfs_root *root, -const char *name,int name_len, +const struct fscrypt_name *name,struct btrfs_inode *dir,u64 index);void btrfs_del_inode_ref_in_log (struct btrfs_trans_handle *trans,struct btrfs_root *root, -const char *name,int name_len, +const struct fscrypt_name *name,struct btrfs_inode *inode,u64 dirid);void btrfs_end_log_trans (struct btrfs_root *root);void btrfs_pin_log_trans (struct btrfs_root *root);
fs/btrfs/xattr.c +14 -7
@@ -21,7 +21,7 @@#include "locking.h" int btrfs_getxattr (struct inode *inode,const char *name, -void *buffer,size_t size) +void *buffer,size_t size) {struct btrfs_dir_item *di;struct btrfs_root *root =BTRFS_I (inode)->root;
@@ -29,6 +29,9 @@ int btrfs_getxattr(struct inode *inode, const char *name,struct extent_buffer *leaf;int ret =0 ;unsigned long data_ptr; +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ((char *) name,strlen (name)) + }; path =btrfs_alloc_path ();if (!path)
@@ -36,7 +39,7 @@ int btrfs_getxattr(struct inode *inode, const char *name,/* lookup the xattr by name */ di =btrfs_lookup_xattr (NULL , root, path,btrfs_ino (BTRFS_I (inode)), - name,strlen (name),0 ); + &fname,0 );if (!di) { ret = -ENODATA ; goto out;
@@ -85,6 +88,10 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,struct btrfs_path *path;size_t name_len =strlen (name);int ret =0 ; +struct fscrypt_name fname = { + .disk_name =FSTR_INIT ((char *) name, name_len) + }; +ASSERT (trans);
@@ -98,7 +105,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,if (!value) { di =btrfs_lookup_xattr (trans, root, path, -btrfs_ino (BTRFS_I (inode)), name, name_len,-1 ); +btrfs_ino (BTRFS_I (inode)), &fname,-1 );if (!di && (flags &XATTR_REPLACE )) ret = -ENODATA ;else if (IS_ERR (di))
@@ -118,7 +125,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,if (flags &XATTR_REPLACE ) {ASSERT (inode_is_locked (inode)); di =btrfs_lookup_xattr (NULL , root, path, -btrfs_ino (BTRFS_I (inode)), name, name_len,0 ); +btrfs_ino (BTRFS_I (inode)), &fname,0 );if (!di) ret = -ENODATA ;else if (IS_ERR (di))
@@ -130,7 +137,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, } ret =btrfs_insert_xattr_item (trans, root, path,btrfs_ino (BTRFS_I (inode)), - name, name_len, value, size); + &fname, value, size);if (ret == -EOVERFLOW ) {/* * We have an existing item in a leaf, split_leaf couldn't
@@ -139,14 +146,14 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,*/ ret =0 ;btrfs_assert_tree_write_locked (path->nodes[0 ]); - di =btrfs_match_dir_item_name (fs_info, path, name, name_len); + di =btrfs_match_dir_item_name (fs_info, path, &fname);if (!di && !(flags &XATTR_REPLACE )) { ret = -ENOSPC ; goto out; } }else if (ret == -EEXIST ) { ret =0 ; - di =btrfs_match_dir_item_name (fs_info, path, name, name_len); + di =btrfs_match_dir_item_name (fs_info, path, &fname);ASSERT (di);/* logic error */ }else if (ret) { goto out;
Signature · 1 line
2.35.1
RFC PATCH v2 4/16 btrfs: factor a fscrypt_name matching method
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
Now that everything in btrfs is dealing in fscrypt_names, fscrypt has a useful function, fscrypt_match_name(), to check whether a fscrypt_name matches a provided buffer. However, btrfs buffers are struct extent_buffer rather than a raw char array, so we need to implement our own imitation of fscrypt_match_name() that deals in extent_buffers, falling back to a simple memcpy if fscrypt isn't compiled. We can then use this matching method in btrfs_match_dir_item_name() and other locations.
This also provides a useful occasion to introduce the new fscrypt file for btrfs, handling the fscrypt-specific functions needed.
--- fs/btrfs/Makefile | 1 + fs/btrfs/dir-item.c | 12 +++++++----- fs/btrfs/extent_io.c | 37 +++++++++++++++++++++++++++++++++++++ fs/btrfs/extent_io.h | 2 ++ fs/btrfs/fscrypt.c | 32 ++++++++++++++++++++++++++++++++ fs/btrfs/fscrypt.h | 25 +++++++++++++++++++++++++ fs/btrfs/inode-item.c | 8 ++++---- fs/btrfs/inode.c | 11 ++++------- fs/btrfs/root-tree.c | 7 ++++--- 9 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 fs/btrfs/fscrypt.c create mode 100644 fs/btrfs/fscrypt.h
fs/btrfs/Makefile +1 -0
@@ -38,6 +38,7 @@ btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o btrfs-$(CONFIG_BTRFS_FS_REF_VERIFY) += ref-verify.o btrfs-$(CONFIG_BLK_DEV_ZONED) += zoned.o btrfs-$(CONFIG_FS_VERITY) += verity.o +btrfs-$(CONFIG_FS_ENCRYPTION) += fscrypt.o btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \ tests/extent-buffer-tests.o tests/btrfs-tests.o \
fs/btrfs/dir-item.c +7 -5
@@ -5,6 +5,7 @@#include "ctree.h" #include "disk-io.h" +#include "fscrypt.h" #include "transaction.h" /*
@@ -390,15 +391,16 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info, total_len =btrfs_item_size (leaf, path->slots[0 ]);while (cur < total_len) { -unsigned long name_ptr = (unsigned long )(dir_item +1 ); - this_len =sizeof (*dir_item) + -btrfs_dir_name_len (leaf, dir_item) + +int dir_name_len =btrfs_dir_name_len (leaf, dir_item); + this_len =sizeof (*dir_item) + dir_name_len +btrfs_dir_data_len (leaf, dir_item);if (btrfs_dir_name_len (leaf, dir_item) ==fname_len (fname) && -memcmp_extent_buffer (leaf,fname_name (fname), name_ptr, -fname_len (fname)) ==0 ) +btrfs_fscrypt_match_name (fname, leaf, + (unsigned long )(dir_item +1 ), + dir_name_len)) {return dir_item; + } cur += this_len; dir_item = (struct btrfs_dir_item *)((char *)dir_item +
fs/btrfs/extent_io.c +37 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include <crypto/sha2.h> #include <linux/bitops.h> #include <linux/slab.h> #include <linux/bio.h>
@@ -6947,6 +6948,42 @@ void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start, } } +void extent_buffer_sha256 (const struct extent_buffer *eb,unsigned long start, +unsigned long len,u8 *out) +{ +size_t cur; +size_t offset; +struct page *page; +char *kaddr; +unsigned long i =get_eb_page_index (start); +struct sha256_state sctx; + +if (check_eb_range (eb, start, len)) +return ; + + offset =get_eb_offset_in_page (eb, start); + +/* +* TODO: This should maybe be using the crypto API, not the fallback, +* but fscrypt uses the fallback and this is only used in emulation of +* fscrypt's buffer sha256 method. +*/ +sha256_init (&sctx); +while (len >0 ) { + page = eb->pages[i]; +assert_eb_page_uptodate (eb, page); + + cur =min (len,PAGE_SIZE - offset); + kaddr =page_address (page); +sha256_update (&sctx, (u8 *)(kaddr + offset), cur); + + len -= cur; + offset =0 ; + i++; + } +sha256_final (&sctx, out); +} +void copy_extent_buffer_full (const struct extent_buffer *dst,const struct extent_buffer *src) {
fs/btrfs/extent_io.h +2 -0
@@ -223,6 +223,8 @@ void memmove_extent_buffer(const struct extent_buffer *dst, unsigned long len);void memzero_extent_buffer (const struct extent_buffer *eb,unsigned long start,unsigned long len); +void extent_buffer_sha256 (const struct extent_buffer *eb,unsigned long start, +unsigned long len,u8 *out);int extent_buffer_test_bit (const struct extent_buffer *eb,unsigned long start,unsigned long pos); void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long start,
fs/btrfs/fscrypt.c new file +32 -0
@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2020 Facebook +*/ + +#include "ctree.h" +#include "fscrypt.h" + +/* fscrypt_match_name() but for an extent_buffer. */ +bool btrfs_fscrypt_match_name (const struct fscrypt_name *fname, +struct extent_buffer *leaf,unsigned long de_name, +u32 de_name_len) +{ +const struct fscrypt_nokey_name *nokey_name = + (const void *)fname->crypto_buf.name; +u8 digest[SHA256_DIGEST_SIZE ]; + +if (likely (fname->disk_name.name)) { +if (de_name_len != fname->disk_name.len) +return false; +return !memcmp_extent_buffer (leaf, fname->disk_name.name, + de_name, de_name_len); + } +if (de_name_len <=sizeof (nokey_name->bytes)) +return false; +if (memcmp_extent_buffer (leaf, nokey_name->bytes, de_name, +sizeof (nokey_name->bytes))) +return false; +extent_buffer_sha256 (leaf, de_name +sizeof (nokey_name->bytes), + de_name_len -sizeof (nokey_name->bytes), digest); +return !memcmp (digest, nokey_name->sha256,sizeof (digest)); +}
fs/btrfs/fscrypt.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef BTRFS_FSCRYPT_H +#define BTRFS_FSCRYPT_H + +#include <linux/fscrypt.h> + +#ifdef CONFIG_FS_ENCRYPTION +bool btrfs_fscrypt_match_name (const struct fscrypt_name *fname, +struct extent_buffer *leaf, +unsigned long de_name,u32 de_name_len); + +#else +static bool btrfs_fscrypt_match_name (const struct fscrypt_name *fname, +struct extent_buffer *leaf, +unsigned long de_name,u32 de_name_len) +{ +if (de_name_len != fname->disk_name.len) +return false; +return !memcmp_extent_buffer (leaf, fname->disk_name.name, + de_name, de_name_len); +} +#endif + +#endif /* BTRFS_FSCRYPT_H */
fs/btrfs/inode-item.c +4 -4
@@ -7,6 +7,7 @@#include "ctree.h" #include "inode-item.h" #include "disk-io.h" +#include "fscrypt.h" #include "transaction.h" #include "print-tree.h"
@@ -62,10 +63,9 @@ struct btrfs_inode_extref *btrfs_find_name_in_ext_backref( name_ptr = (unsigned long )(&extref->name); ref_name_len =btrfs_inode_extref_name_len (leaf, extref); -if (ref_name_len ==fname_len (fname) && -btrfs_inode_extref_parent (leaf, extref) == ref_objectid && - (memcmp_extent_buffer (leaf,fname_name (fname), name_ptr, -fname_len (fname)) ==0 )) +if (btrfs_inode_extref_parent (leaf, extref) == ref_objectid && +btrfs_fscrypt_match_name (fname, leaf, name_ptr, + ref_name_len))return extref; cur_offset += ref_name_len +sizeof (*extref);
fs/btrfs/inode.c +4 -7
@@ -55,6 +55,7 @@#include "zoned.h" #include "subpage.h" #include "inode-item.h" +#include "fscrypt.h" struct btrfs_iget_args {u64 ino;
@@ -5649,14 +5650,10 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info, leaf = path->nodes[0 ]; ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref); -if (btrfs_root_ref_dirid (leaf, ref) !=btrfs_ino (BTRFS_I (dir)) || -btrfs_root_ref_name_len (leaf, ref) != dentry->d_name.len) +if (btrfs_root_ref_dirid (leaf, ref) !=btrfs_ino (BTRFS_I (dir))) goto out; - - ret =memcmp_extent_buffer (leaf, dentry->d_name.name, - (unsigned long )(ref +1 ), - dentry->d_name.len); -if (ret) +if (!btrfs_fscrypt_match_name (&fname, leaf, (unsigned long )(ref +1 ), +btrfs_root_ref_name_len (leaf, ref))) goto out;btrfs_release_path (path);
fs/btrfs/root-tree.c +4 -3
@@ -8,6 +8,7 @@#include "ctree.h" #include "transaction.h" #include "disk-io.h" +#include "fscrypt.h" #include "print-tree.h" #include "qgroup.h" #include "space-info.h"
@@ -352,14 +353,14 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,if (ret <0 ) goto out;if (ret ==0 ) { +u32 name_len; leaf = path->nodes[0 ]; ref =btrfs_item_ptr (leaf, path->slots[0 ], struct btrfs_root_ref); ptr = (unsigned long )(ref +1 ); + name_len =btrfs_root_ref_name_len (leaf, ref);if ((btrfs_root_ref_dirid (leaf, ref) != dirid) || - (btrfs_root_ref_name_len (leaf, ref) !=fname_len (fname)) || -memcmp_extent_buffer (leaf,fname_name (fname), ptr, -fname_len (fname))) { + !btrfs_fscrypt_match_name (fname, leaf, ptr, name_len)) { err = -ENOENT ; goto out; }
Signature · 1 line
2.35.1
RFC PATCH v2 5/16 btrfs: disable various operations on encrypted inodes
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
Initially, only normal data extents, using the normal (non-direct) IO path, will be encrypted. This change forbids various other bits:
- allows reflinking only if both inodes have the same encryption status
- disables compressing encrypted inodes
- disables direct IO on encrypted inodes
- disable inline data on encrypted inodes
--- fs/btrfs/btrfs_inode.h | 3 +++ fs/btrfs/file.c | 4 ++-- fs/btrfs/inode.c | 3 ++- fs/btrfs/reflink.c | 7 +++++++ 4 files changed, 14 insertions(+), 3 deletions(-)
fs/btrfs/btrfs_inode.h +3 -0
@@ -400,6 +400,9 @@ static inline bool btrfs_inode_in_log(struct btrfs_inode *inode, u64 generation)*/ static inline bool btrfs_inode_can_compress (const struct btrfs_inode *inode) { +if (IS_ENCRYPTED (&inode->vfs_inode)) +return false; +if (inode->flags &BTRFS_INODE_NODATACOW || inode->flags &BTRFS_INODE_NODATASUM )return false;
fs/btrfs/file.c +2 -2
@@ -1896,7 +1896,7 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) goto relock; } -if (check_direct_IO (fs_info, from, pos)) { +if (IS_ENCRYPTED (inode) ||check_direct_IO (fs_info, from, pos)) {btrfs_inode_unlock (inode, ilock_flags); goto buffered; }
@@ -3743,7 +3743,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)ssize_t read =0 ;ssize_t ret; -if (fsverity_active (inode)) +if (IS_ENCRYPTED (inode) ||fsverity_active (inode))return 0 ;if (check_direct_read (btrfs_sb (inode->i_sb), to, iocb->ki_pos))
fs/btrfs/inode.c +2 -1
@@ -409,7 +409,8 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,* compressed) data fits in a leaf and the configured maximum inline * size. */ -if (size <i_size_read (&inode->vfs_inode) || +if (IS_ENCRYPTED (&inode->vfs_inode) || + size <i_size_read (&inode->vfs_inode) || size > fs_info->sectorsize || data_len >BTRFS_MAX_INLINE_DATA_SIZE (fs_info) || data_len > fs_info->max_inline)
fs/btrfs/reflink.c +7 -0
@@ -805,6 +805,13 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,ASSERT (inode_in->i_sb == inode_out->i_sb); } +/* +* Can only reflink encrypted files if both files are encrypted. +*/ +if (!fscrypt_have_same_policy (inode_in, inode_out)) { +return -EINVAL ; + } +/* Don't make the dst file partly checksummed */ if ((BTRFS_I (inode_in)->flags &BTRFS_INODE_NODATASUM ) != (BTRFS_I (inode_out)->flags &BTRFS_INODE_NODATASUM )) {
Signature · 1 line
2.35.1
RFC PATCH v2 6/16 btrfs: add fscrypt operation table to superblock
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
To use fscrypt_prepare_new_inode(), the superblock must have fscrypt operations registered.
--- fs/btrfs/fscrypt.c | 3 +++ fs/btrfs/fscrypt.h | 1 + fs/btrfs/super.c | 3 +++ 3 files changed, 7 insertions(+)
fs/btrfs/fscrypt.c +3 -0
@@ -30,3 +30,6 @@ bool btrfs_fscrypt_match_name(const struct fscrypt_name *fname, de_name_len - sizeof(nokey_name->bytes), digest);return !memcmp (digest, nokey_name->sha256,sizeof (digest)); } + +const struct fscrypt_operations btrfs_fscrypt_ops = { +};
fs/btrfs/fscrypt.h +1 -0
@@ -22,4 +22,5 @@ static bool btrfs_fscrypt_match_name(const struct fscrypt_name *fname, }#endif +extern const struct fscrypt_operations btrfs_fscrypt_ops;#endif /* BTRFS_FSCRYPT_H */
fs/btrfs/super.c +3 -0
@@ -47,6 +47,8 @@#include "tests/btrfs-tests.h" #include "block-group.h" #include "discard.h" +#include "fscrypt.h" +#include "qgroup.h" #include "raid56.h" #define CREATE_TRACE_POINTS
@@ -1443,6 +1445,7 @@ static int btrfs_fill_super(struct super_block *sb, sb->s_vop = &btrfs_verityops;#endif sb->s_xattr = btrfs_xattr_handlers; +fscrypt_set_ops (sb, &btrfs_fscrypt_ops); sb->s_time_gran =1 ;#ifdef CONFIG_BTRFS_FS_POSIX_ACL sb->s_flags |=SB_POSIXACL ;
Signature · 1 line
2.35.1
RFC PATCH v2 7/16 btrfs: start using fscrypt hooks.
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
In order to appropriately encrypt, create, open, rename, and various symlink operations must call fscrypt hooks. These determine whether the inode should be encrypted and do other preparatory actions.
--- fs/btrfs/ctree.h | 1 + fs/btrfs/file.c | 3 ++ fs/btrfs/inode.c | 84 +++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 76 insertions(+), 12 deletions(-)
fs/btrfs/ctree.h +1 -0
@@ -3348,6 +3348,7 @@ struct btrfs_new_inode_args {*/ struct posix_acl *default_acl;struct posix_acl *acl; +bool encrypt; };int btrfs_new_inode_prepare (struct btrfs_new_inode_args *args,unsigned int *trans_num_items);
fs/btrfs/file.c +3 -0
@@ -3709,6 +3709,9 @@ static int btrfs_file_open(struct inode *inode, struct file *filp)int ret; filp->f_mode |=FMODE_NOWAIT |FMODE_BUF_RASYNC ; + ret =fscrypt_file_open (inode, filp); +if (ret) +return ret; ret =fsverity_file_open (inode, filp);if (ret)
fs/btrfs/inode.c +72 -12
176 lines not on this page · raw message
Signature · 1 line
2.35.1
RFC PATCH v2 8/16 btrfs: add a subvolume flag for whole-volume encryption
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
In many cases, we will want to encrypt all of a subvolume; adding a subvolume flag allows this. However, since an unencrypted subvolume would be unable to read encrypted data, encrypted subvolumes should only be snapshottable to other encrypted subvolumes.
--- fs/btrfs/ctree.h | 3 + fs/btrfs/fscrypt.c | 160 ++++++++++++++++++++++++++++++++ fs/btrfs/inode.c | 38 ++++++++ fs/btrfs/ioctl.c | 10 +- fs/btrfs/tree-checker.c | 1 + include/uapi/linux/btrfs_tree.h | 10 ++ 6 files changed, 221 insertions(+), 1 deletion(-)
fs/btrfs/ctree.h +3 -0
@@ -33,6 +33,7 @@#include "extent-io-tree.h" #include "extent_io.h" #include "extent_map.h" +#include "fscrypt.h" #include "async-thread.h" #include "block-rsv.h" #include "locking.h"
@@ -1586,6 +1587,7 @@ do { \#define BTRFS_INODE_NOATIME (1U << 9)#define BTRFS_INODE_DIRSYNC (1U << 10)#define BTRFS_INODE_COMPRESS (1U << 11) +#define BTRFS_INODE_FSCRYPT_CONTEXT (1U << 12)#define BTRFS_INODE_ROOT_ITEM_INIT (1U << 31)
@@ -1602,6 +1604,7 @@ do { \BTRFS_INODE_NOATIME | \BTRFS_INODE_DIRSYNC | \BTRFS_INODE_COMPRESS | \ +BTRFS_INODE_FSCRYPT_CONTEXT | \ BTRFS_INODE_ROOT_ITEM_INIT) #define BTRFS_INODE_RO_VERITY (1U << 0)
fs/btrfs/fscrypt.c +160 -0
173 lines not on this page · raw message
fs/btrfs/inode.c +38 -0
@@ -6281,6 +6281,34 @@ int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args,struct inode *inode = args->inode;int ret; +if (fscrypt_is_nokey_name (args->dentry)) +return -ENOKEY ; + +if (IS_ENCRYPTED (dir) && + !(BTRFS_I (dir)->flags &BTRFS_INODE_FSCRYPT_CONTEXT )) { +struct inode *root_inode; +bool encrypt; + + root_inode =btrfs_iget (inode->i_sb,BTRFS_FIRST_FREE_OBJECTID , +BTRFS_I (dir)->root); +if (IS_ERR (root_inode)) +return PTR_ERR (root_inode); +/* +* TODO: perhaps instead of faking making a new dir to get a +* new context, it would be better to expose +* fscrypt_setup_encryption_info() for our use. +*/ + ret =fscrypt_prepare_new_inode (root_inode, dir, &encrypt); +if (!ret) { + ret =fscrypt_set_context (dir,NULL ); +if (ret) +fscrypt_put_encryption_info (dir); + } +iput (root_inode); +if (ret) +return ret; + } +if (!args->orphan) { ret =fscrypt_setup_filename (dir, &args->dentry->d_name,0 , &args->fname);
@@ -6314,6 +6342,8 @@ int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args,if (dir->i_security) (*trans_num_items)++;#endif +if (args->encrypt) + (*trans_num_items)++;/* 1 to add fscrypt item */ if (args->orphan) {/* 1 to add orphan item */ (*trans_num_items)++;
@@ -6567,6 +6597,14 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans, } } +if (args->encrypt) { + ret =fscrypt_set_context (inode, trans); +if (ret) { +btrfs_abort_transaction (trans, ret); + goto discard; + } + } +inode_tree_add (inode);trace_btrfs_inode_new (inode);
fs/btrfs/ioctl.c +9 -1
@@ -658,7 +658,8 @@ static noinline int create_subvol(struct user_namespace *mnt_userns, fs_info->nodesize);btrfs_set_stack_inode_mode (inode_item,S_IFDIR |0755 ); -btrfs_set_root_flags (root_item,0 ); +btrfs_set_root_flags (root_item, new_inode_args.encrypt ? +BTRFS_ROOT_SUBVOL_FSCRYPT :0 );btrfs_set_root_limit (root_item,0 );btrfs_set_stack_inode_flags (inode_item,BTRFS_INODE_ROOT_ITEM_INIT );
@@ -787,6 +788,13 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,return -ETXTBSY ; } +if ((btrfs_root_flags (&root->root_item) &BTRFS_ROOT_SUBVOL_FSCRYPT ) && + !IS_ENCRYPTED (dir)) { +btrfs_warn (fs_info, +"cannot snapshot encrypted volume to unencrypted destination" ); +return -EXDEV ; + } + pending_snapshot =kzalloc (sizeof (*pending_snapshot),GFP_KERNEL );if (!pending_snapshot)return -ENOMEM ;
fs/btrfs/tree-checker.c +1 -0
@@ -1124,6 +1124,7 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key,struct btrfs_fs_info *fs_info = leaf->fs_info;struct btrfs_root_item ri = {0 };const u64 valid_root_flags =BTRFS_ROOT_SUBVOL_RDONLY | +BTRFS_ROOT_SUBVOL_FSCRYPT |BTRFS_ROOT_SUBVOL_DEAD ;int ret;
include/uapi/linux/btrfs_tree.h +10 -0
@@ -144,6 +144,8 @@#define BTRFS_VERITY_DESC_ITEM_KEY 36#define BTRFS_VERITY_MERKLE_ITEM_KEY 37 +#define BTRFS_FSCRYPT_CTXT_ITEM_KEY 41 +#define BTRFS_ORPHAN_ITEM_KEY 48/* reserve 2-15 close to the inode for later flexibility */
@@ -633,6 +635,8 @@ struct btrfs_dir_item { } __attribute__ ((__packed__));#define BTRFS_ROOT_SUBVOL_RDONLY (1ULL << 0) +/* Top-level subvolume directory is encrypted with fscrypt. */ +#define BTRFS_ROOT_SUBVOL_FSCRYPT (1ULL << 1)/* * Internal in-memory flag that a subvolume has been marked for deletion but
@@ -788,6 +792,12 @@ enum { BTRFS_NR_FILE_EXTENT_TYPES = 3, }; +enum { +BTRFS_ENCRYPTION_NONE , +BTRFS_ENCRYPTION_FSCRYPT , +BTRFS_NR_ENCRYPTION_TYPES , +}; +struct btrfs_file_extent_item {/* * transaction id that created this extent
Signature · 1 line
2.35.1
RFC PATCH v2 9/16 btrfs: translate btrfs encryption flags and encrypted inode flag.
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
In btrfs, a file can be encrypted either if its directory is encrypted or its root subvolume is encrypted, so translate both to the standard flags.
--- fs/btrfs/ioctl.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +11 -2
@@ -7,6 +7,7 @@#include <linux/bio.h> #include <linux/file.h> #include <linux/fs.h> +#include <linux/fscrypt.h> #include <linux/fsnotify.h> #include <linux/pagemap.h> #include <linux/highmem.h>
@@ -147,6 +148,10 @@ static unsigned int btrfs_inode_flags_to_fsflags(struct btrfs_inode *binode) iflags |=FS_NOCOW_FL ;if (ro_flags &BTRFS_INODE_RO_VERITY ) iflags |=FS_VERITY_FL ; +if ((binode->flags &BTRFS_INODE_FSCRYPT_CONTEXT ) || + (btrfs_root_flags (&binode->root->root_item) & +BTRFS_ROOT_SUBVOL_FSCRYPT )) + iflags |=FS_ENCRYPT_FL ;if (flags &BTRFS_INODE_NOCOMPRESS ) iflags |=FS_NOCOMP_FL ;
@@ -176,10 +181,14 @@ void btrfs_sync_inode_flags_to_i_flags(struct inode *inode) new_fl |=S_DIRSYNC ;if (binode->ro_flags &BTRFS_INODE_RO_VERITY ) new_fl |=S_VERITY ; +if ((binode->flags &BTRFS_INODE_FSCRYPT_CONTEXT ) || + (btrfs_root_flags (&binode->root->root_item) & +BTRFS_ROOT_SUBVOL_FSCRYPT )) + new_fl |=S_ENCRYPTED ;set_mask_bits (&inode->i_flags,S_SYNC |S_APPEND |S_IMMUTABLE |S_NOATIME |S_DIRSYNC | -S_VERITY , new_fl); +S_VERITY |S_ENCRYPTED , new_fl); }/*
@@ -192,7 +201,7 @@ static int check_fsflags(unsigned int old_flags, unsigned int flags)FS_NOATIME_FL |FS_NODUMP_FL | \FS_SYNC_FL |FS_DIRSYNC_FL | \FS_NOCOMP_FL |FS_COMPR_FL | - FS_NOCOW_FL)) + FS_NOCOW_FL | FS_ENCRYPT_FL)) return -EOPNOTSUPP;/* COMPR and NOCOMP on new/old are valid */
Signature · 1 line
2.35.1
RFC PATCH v2 10/16 btrfs: add iv generation function for fscrypt
In reply to Sweet Tea DorminyAs btrfs cannot use the standard inode or logical block based encryption for data block encryption, it must provide a IV generation function and users must use the IV_FROM_FS policy. For filenames, we can just use the nonce that fscrypt stores per-inode, since these encrypted datum are not shared between inodes; later on, we will store an IV per file extent, and return it in this function for data encryption.
--- fs/btrfs/fscrypt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/btrfs/fscrypt.c +12 -0
@@ -187,9 +187,21 @@ static bool btrfs_fscrypt_empty_dir(struct inode *inode)return true; } +static void btrfs_fscrypt_get_iv (u8 *iv,int ivsize,struct inode *inode, +u64 lblk_num) +{ +/* +* For encryption that doesn't involve extent data, juse use the +* nonce already loaded into the iv buffer. +*/ +return ; +} +const struct fscrypt_operations btrfs_fscrypt_ops = { + .flags =FS_CFLG_ALLOW_PARTIAL , .key_prefix ="btrfs:" , .get_context = btrfs_fscrypt_get_context, .set_context = btrfs_fscrypt_set_context, .empty_dir = btrfs_fscrypt_empty_dir, + .get_fs_defined_iv = btrfs_fscrypt_get_iv, };
Signature · 1 line
2.35.1
RFC PATCH v2 12/16 btrfs: Add new FEATURE_INCOMPAT_FSCRYPT feature flag.
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
As fscrypt files will be incompatible with older filesystem versions, new filesystems should be created with an incompat flag for fscrypt.
--- fs/btrfs/ctree.h | 6 ++++-- include/uapi/linux/btrfs.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/ctree.h +4 -2
@@ -334,7 +334,8 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE); BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ BTRFS_FEATURE_INCOMPAT_ZONED | \ - BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2) + BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 | \ + BTRFS_FEATURE_INCOMPAT_FSCRYPT)#else #define BTRFS_FEATURE_INCOMPAT_SUPP \ (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \
@@ -349,7 +350,8 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE); BTRFS_FEATURE_INCOMPAT_NO_HOLES | \ BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ - BTRFS_FEATURE_INCOMPAT_ZONED) + BTRFS_FEATURE_INCOMPAT_ZONED | \ + BTRFS_FEATURE_INCOMPAT_FSCRYPT)#endif #define BTRFS_FEATURE_INCOMPAT_SAFE_SET \
include/uapi/linux/btrfs.h +1 -0
@@ -310,6 +310,7 @@ struct btrfs_ioctl_fs_info_args {#define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11)#define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12)#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) +#define BTRFS_FEATURE_INCOMPAT_FSCRYPT (1ULL << 14)struct btrfs_ioctl_feature_flags {__u64 compat_flags;
Signature · 1 line
2.35.1
RFC PATCH v2 11/16 btrfs: store an IV per encrypted normal file extent
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
In order to encrypt data, each file extent must have its own persistent random IV, which is then provided to fscrypt upon request. This IV is only needed for encrypted extents and is of variable size on disk, so file extents must additionally keep track of their actual length.
--- fs/btrfs/ctree.h | 29 ++++++++++++++ fs/btrfs/extent_map.h | 8 ++++ fs/btrfs/file-item.c | 11 ++++++ fs/btrfs/file.c | 4 +- fs/btrfs/fscrypt.h | 23 +++++++++++ fs/btrfs/inode.c | 70 +++++++++++++++++++++++++-------- fs/btrfs/ordered-data.c | 12 +++++- fs/btrfs/ordered-data.h | 3 +- fs/btrfs/reflink.c | 1 + fs/btrfs/tree-checker.c | 36 +++++++++++++---- fs/btrfs/tree-log.c | 9 +++++ include/uapi/linux/btrfs_tree.h | 9 +++++ 12 files changed, 186 insertions(+), 29 deletions(-)
fs/btrfs/ctree.h +29 -0
@@ -37,6 +37,7 @@#include "async-thread.h" #include "block-rsv.h" #include "locking.h" +#include "fscrypt.h" struct btrfs_trans_handle ;struct btrfs_transaction ;
@@ -1356,6 +1357,7 @@ struct btrfs_replace_extent_info {u64 file_offset;/* Pointer to a file extent item of type regular or prealloc. */ char *extent_buf; +u32 extent_buf_size;/* * Set to true when attempting to replace a file range with a new extent * described by this structure, set to false when attempting to clone an
@@ -2591,6 +2593,15 @@ BTRFS_SETGET_STACK_FUNCS(stack_file_extent_disk_num_bytes, struct btrfs_file_extent_item, disk_num_bytes, 64);BTRFS_SETGET_STACK_FUNCS (stack_file_extent_compression , struct btrfs_file_extent_item, compression, 8); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_encryption, + struct btrfs_file_extent_item, encryption, 8); + +static inline u8 btrfs_stack_file_extent_encryption_ivsize (struct btrfs_file_extent_item *e) +{ +u8 ivsize; +btrfs_unpack_encryption (e->encryption,NULL , &ivsize); +return ivsize; +}static inline unsigned long btrfs_file_extent_inline_start (const struct btrfs_file_extent_item *e)
@@ -2623,6 +2634,24 @@ BTRFS_SETGET_FUNCS(file_extent_encryption, struct btrfs_file_extent_item, BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item, other_encoding,16 ); +static inline u8 +btrfs_file_extent_encryption_ivsize (const struct extent_buffer *eb, +struct btrfs_file_extent_item *e) +{ +u8 ivsize; +btrfs_unpack_encryption (btrfs_file_extent_encryption (eb, e), +NULL , &ivsize); +return ivsize; +} + +static inline u8 +btrfs_file_extent_ivsize_from_item (const struct extent_buffer *leaf, +const struct btrfs_path *path) +{ +return (btrfs_item_size (leaf, path->slots[0 ]) - +sizeof (struct btrfs_file_extent_item )); +} +/* * this returns the number of bytes used by the item on disk, minus the * size of any extent headers. If a file is compressed on disk, this is
fs/btrfs/extent_map.h +8 -0
@@ -5,6 +5,7 @@#include <linux/rbtree.h> #include <linux/refcount.h> +#include "fscrypt.h" #define EXTENT_MAP_LAST_BYTE ((u64)-4)#define EXTENT_MAP_HOLE ((u64)-3)
@@ -27,6 +28,8 @@ enum {EXTENT_FLAG_FS_MAPPING ,/* This em is merged from two or more physically adjacent ems */ EXTENT_FLAG_MERGED , +/* This em has a iv */ + EXTENT_FLAG_ENCRYPTED, }; struct extent_map {
@@ -50,6 +53,11 @@ struct extent_map {*/ u64 generation;unsigned long flags; +/* +* TODO: could either make FSCRYPT_MAX_IV_SIZE public or allocate this +* separately, of size 16 if applicable to the specific policy. +*/ +u8 iv[FSCRYPT_MAX_IV_SIZE ];/* Used for chunk mappings, flag EXTENT_FLAG_FS_MAPPING must be set */ struct map_lookup *map_lookup;refcount_t refs;
fs/btrfs/file-item.c +11 -0
@@ -1216,6 +1216,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, em->generation =btrfs_file_extent_generation (leaf, fi);if (type ==BTRFS_FILE_EXTENT_REG || type ==BTRFS_FILE_EXTENT_PREALLOC ) { +u8 ivsize; em->start = extent_start; em->len = extent_end - extent_start; em->orig_start = extent_start -
@@ -1231,6 +1232,10 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, em->compress_type = compress_type; em->block_start = bytenr; em->block_len = em->orig_block_len; + }else if (btrfs_file_extent_encryption (leaf, fi)) { +set_bit (EXTENT_FLAG_ENCRYPTED , &em->flags); + em->block_start = bytenr; + em->block_len = em->orig_block_len; }else { bytenr +=btrfs_file_extent_offset (leaf, fi); em->block_start = bytenr;
@@ -1238,6 +1243,12 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,if (type ==BTRFS_FILE_EXTENT_PREALLOC )set_bit (EXTENT_FLAG_PREALLOC , &em->flags); } + + ivsize =btrfs_file_extent_ivsize_from_item (leaf, path); +ASSERT (ivsize ==btrfs_file_extent_encryption_ivsize (leaf, fi)); + +read_extent_buffer (leaf, em->iv, (unsigned long )fi->iv, + ivsize); }else if (type ==BTRFS_FILE_EXTENT_INLINE ) { em->block_start =EXTENT_MAP_INLINE ; em->start = extent_start;
fs/btrfs/file.c +2 -2
@@ -2658,14 +2658,14 @@ static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans, key.type =BTRFS_EXTENT_DATA_KEY ; key.offset = extent_info->file_offset; ret =btrfs_insert_empty_item (trans, root, path, &key, -sizeof (struct btrfs_file_extent_item )); + extent_info->extent_buf_size);if (ret)return ret; leaf = path->nodes[0 ]; slot = path->slots[0 ];write_extent_buffer (leaf, extent_info->extent_buf,btrfs_item_ptr_offset (leaf, slot), -sizeof (struct btrfs_file_extent_item )); + extent_info->extent_buf_size); extent = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item);ASSERT (btrfs_file_extent_type (leaf, extent) !=BTRFS_FILE_EXTENT_INLINE );btrfs_set_file_extent_offset (leaf, extent, extent_info->data_offset);
fs/btrfs/fscrypt.h +23 -0
@@ -5,6 +5,9 @@#include <linux/fscrypt.h> +#define BTRFS_ENCRYPTION_POLICY_MASK 0x0f +#define BTRFS_ENCRYPTION_IVSIZE_MASK 0xf0 +#ifdef CONFIG_FS_ENCRYPTION bool btrfs_fscrypt_match_name(const struct fscrypt_name *fname, struct extent_buffer *leaf,
@@ -22,5 +25,25 @@ static bool btrfs_fscrypt_match_name(const struct fscrypt_name *fname, }#endif +static inline void btrfs_unpack_encryption (u8 encryption, +u8 *policy, +u8 *ivsize) +{ +if (policy) + *policy = encryption &BTRFS_ENCRYPTION_POLICY_MASK ; +if (ivsize) { +u8 transformed_ivsize = + (encryption &BTRFS_ENCRYPTION_IVSIZE_MASK ) >>4 ; + *ivsize = (transformed_ivsize ? + (1 << (transformed_ivsize -1 )) :0 ); + } +} + +static inline u8 btrfs_pack_encryption (u8 policy,u8 ivsize) +{ +u8 transformed_ivsize = ivsize ?ilog2 (ivsize) +1 :0 ; +return policy | (transformed_ivsize <<4 ); +} +extern const struct fscrypt_operations btrfs_fscrypt_ops;#endif /* BTRFS_FSCRYPT_H */
fs/btrfs/inode.c +54 -16
190 lines not on this page · raw message
fs/btrfs/ordered-data.c +10 -2
@@ -5,6 +5,7 @@#include <linux/slab.h> #include <linux/blkdev.h> +#include <linux/random.h> #include <linux/writeback.h> #include <linux/sched/mm.h> #include "misc.h"
@@ -164,13 +165,14 @@ static inline struct rb_node *tree_search(struct btrfs_ordered_inode_tree *tree,int btrfs_add_ordered_extent (struct btrfs_inode *inode,u64 file_offset,u64 num_bytes,u64 ram_bytes,u64 disk_bytenr,u64 disk_num_bytes,u64 offset,unsigned flags, -int compress_type) +int compress_type,u8 *iv) {struct btrfs_root *root = inode->root;struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_ordered_inode_tree *tree = &inode->ordered_tree;struct rb_node *node;struct btrfs_ordered_extent *entry; +const u8 ivsize =fscrypt_mode_ivsize (&inode->vfs_inode);int ret; if (flags &
@@ -199,6 +201,12 @@ int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset, entry->disk_bytenr = disk_bytenr; entry->disk_num_bytes = disk_num_bytes; entry->offset = offset; +if (ivsize) { +if (iv ==NULL ) +get_random_bytes (entry->iv, ivsize); +else +memcpy (entry->iv, iv, ivsize); + } entry->bytes_left = num_bytes; entry->inode =igrab (&inode->vfs_inode); entry->compress_type = compress_type;
@@ -1059,7 +1067,7 @@ static int clone_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pos,WARN_ON_ONCE (flags & (1 <<BTRFS_ORDERED_COMPRESSED ));return btrfs_add_ordered_extent (BTRFS_I (inode), file_offset, len, len, disk_bytenr, len,0 , flags, - ordered->compress_type); + ordered->compress_type, ordered->iv); } int btrfs_split_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pre,
fs/btrfs/ordered-data.h +2 -1
@@ -99,6 +99,7 @@ struct btrfs_ordered_extent {u64 disk_bytenr;u64 disk_num_bytes;u64 offset; +u8 iv[FSCRYPT_MAX_IV_SIZE ];/* number of bytes that still need writing */ u64 bytes_left;
@@ -194,7 +195,7 @@ bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode,int btrfs_add_ordered_extent (struct btrfs_inode *inode,u64 file_offset,u64 num_bytes,u64 ram_bytes,u64 disk_bytenr,u64 disk_num_bytes,u64 offset,unsigned flags, -int compress_type); +int compress_type,u8 *iv);void btrfs_add_ordered_sum (struct btrfs_ordered_extent *entry,struct btrfs_ordered_sum *sum); struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,
fs/btrfs/reflink.c +1 -0
@@ -495,6 +495,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, clone_info.data_len = datal; clone_info.file_offset = new_key.offset; clone_info.extent_buf = buf; + clone_info.extent_buf_size = size; clone_info.is_new_extent = false; clone_info.update_times = !no_time_update; ret = btrfs_replace_file_extents(BTRFS_I(inode), path,
fs/btrfs/tree-checker.c +28 -8
@@ -204,6 +204,7 @@ static int check_extent_data_item(struct extent_buffer *leaf,u32 sectorsize = fs_info->sectorsize;u32 item_size =btrfs_item_size (leaf, slot);u64 extent_end; +u8 policy;if (unlikely (!IS_ALIGNED (key->offset, sectorsize))) { file_extent_err(leaf, slot,
@@ -255,10 +256,12 @@ static int check_extent_data_item(struct extent_buffer *leaf, BTRFS_NR_COMPRESS_TYPES - 1);return -EUCLEAN ; } -if (unlikely (btrfs_file_extent_encryption (leaf, fi))) { +btrfs_unpack_encryption (btrfs_file_extent_encryption (leaf, fi), + &policy,NULL ); +if (unlikely (policy >=BTRFS_NR_ENCRYPTION_TYPES )) {file_extent_err (leaf, slot, -"invalid encryption for file extent, have %u expect 0" , -btrfs_file_extent_encryption (leaf, fi)); +"invalid encryption for file extent, have %u expect range [0, %u]" , + policy,BTRFS_NR_ENCRYPTION_TYPES -1 );return -EUCLEAN ; }if (btrfs_file_extent_type (leaf, fi) ==BTRFS_FILE_EXTENT_INLINE ) {
@@ -287,12 +290,29 @@ static int check_extent_data_item(struct extent_buffer *leaf,return 0 ; } -/* Regular or preallocated extent has fixed item size */ -if (unlikely (item_size !=sizeof (*fi))) { -file_extent_err (leaf, slot, +if (policy ==BTRFS_ENCRYPTION_FSCRYPT ) { +u8 ivsize =btrfs_file_extent_encryption_ivsize (leaf, fi); +if (unlikely (item_size !=sizeof (*fi) + ivsize)) { +file_extent_err (leaf, slot, +"invalid item size for encrypted file extent, have %u expect = %zu + iv of size %u" , + item_size,sizeof (*fi), ivsize); +return -EUCLEAN ; + } +/* Only regular extents should be encrypted. */ +if (btrfs_file_extent_type (leaf, fi) !=BTRFS_FILE_EXTENT_REG ) { +file_extent_err (leaf, slot, +"invalid type for encrypted file extent, have %u expect %u" , +btrfs_file_extent_type (leaf, fi), +BTRFS_FILE_EXTENT_REG ); +return -EUCLEAN ; + } + }else { +if (unlikely (item_size !=sizeof (*fi))) { +file_extent_err (leaf, slot,"invalid item size for reg/prealloc file extent, have %u expect %zu" , - item_size,sizeof (*fi)); -return -EUCLEAN ; + item_size,sizeof (*fi)); +return -EUCLEAN ; + } } if (unlikely(CHECK_FE_ALIGNED(leaf, slot, fi, ram_bytes, sectorsize) || CHECK_FE_ALIGNED(leaf, slot, fi, disk_bytenr, sectorsize) ||
fs/btrfs/tree-log.c +9 -0
@@ -4758,6 +4758,9 @@ static int log_one_extent(struct btrfs_trans_handle *trans,u64 extent_offset = em->start - em->orig_start;u64 block_len;int ret; +u8 ivsize =fscrypt_mode_ivsize (&inode->vfs_inode); +u8 encryption =btrfs_pack_encryption (IS_ENCRYPTED (&inode->vfs_inode) ? +BTRFS_ENCRYPTION_FSCRYPT :0 , ivsize);btrfs_set_stack_file_extent_generation (&fi, trans->transid);if (test_bit (EXTENT_FLAG_PREALLOC , &em->flags))
@@ -4779,6 +4782,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,btrfs_set_stack_file_extent_num_bytes (&fi, em->len);btrfs_set_stack_file_extent_ram_bytes (&fi, em->ram_bytes);btrfs_set_stack_file_extent_compression (&fi, em->compress_type); +btrfs_set_stack_file_extent_encryption (&fi, encryption); ret =log_extent_csums (trans, inode, log, em, ctx);if (ret)
@@ -4818,6 +4822,11 @@ static int log_one_extent(struct btrfs_trans_handle *trans,write_extent_buffer (leaf, &fi,btrfs_item_ptr_offset (leaf, path->slots[0 ]),sizeof (fi)); +if (ivsize) +write_extent_buffer (leaf, em->iv, +btrfs_item_ptr_offset (leaf, path->slots[0 ]) + +sizeof (fi), ivsize); +btrfs_mark_buffer_dirty (leaf);btrfs_release_path (path);
include/uapi/linux/btrfs_tree.h +9 -0
@@ -820,6 +820,10 @@ struct btrfs_file_extent_item {* but not for stat. */ __u8 compression; +/* +* This field contains 4 bits of encryption type in the lower bits, +* 4 bits of ivsize in the upper bits. The unencrypted value is 0. +*/ __u8 encryption;__le16 other_encoding;/* spare for later use */
@@ -848,6 +852,11 @@ struct btrfs_file_extent_item {*/ __le64 num_bytes; +/* +* Encryption initialization vector. Only present if extent is +* encrypted (stored in the encryption field). +*/ +__u8 iv[0 ]; } __attribute__ ((__packed__));struct btrfs_csum_item {
Signature · 1 line
2.35.1
RFC PATCH v2 13/16 btrfs: reuse encrypted filename hash when possible.
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
For encrypted fscrypt_names, we can reuse fscrypt's precomputed hash of the encrypted name to generate our own hash, instead of rehashing the unencrypted name (which may not be possible if it's a nokey name).
--- fs/btrfs/ctree.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
fs/btrfs/ctree.h +18 -3
@@ -2773,7 +2773,10 @@ static inline void btrfs_crc32c_final(u32 crc, u8 *result)static inline u64 btrfs_name_hash (const struct fscrypt_name *name) { -return crc32c ((u32 )~1 ,fname_name (name),fname_len (name)); +if (fname_name (name)) +return crc32c ((u32 )~1 ,fname_name (name),fname_len (name)); +else +return name->hash | ((u64 )name->minor_hash <<32 ); }/*
@@ -2782,8 +2785,20 @@ static inline u64 btrfs_name_hash(const struct fscrypt_name *name)static inline u64 btrfs_extref_hash (u64 parent_objectid,const struct fscrypt_name *name) { -return (u64 )crc32c (parent_objectid,fname_name (name), -fname_len (name)); +/* +* If the name is encrypted and we don't have the key, we can use the +* fscrypt-provided hash instead of the normal name, and do the steps +* of crc32c() manually. Else, just hash the name, parent objectid, +* and name length. +*/ +if (fname_name (name)) +return (u64 )crc32c (parent_objectid,fname_name (name), +fname_len (name)); +else +return (__crc32c_le_combine (parent_objectid, + name->hash, +fname_len (name)) ^ +__crc32c_le_shift (~1 ,fname_len (name))); }static inline gfp_t btrfs_alloc_write_mask (struct address_space *mapping)
Signature · 1 line
2.35.1
RFC PATCH v2 14/16 btrfs: adapt directory read and lookup to potentially encrypted filenames
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
When filenames can be encrypted, if we don't initially match a desired filename, we have to try decrypting it with the directory key to see if it matches in plaintext. Similarly, for readdir, we need to read encrypted directory items as well as unencrypted.
--- fs/btrfs/delayed-inode.c | 32 +++++++++++++--- fs/btrfs/delayed-inode.h | 4 +- fs/btrfs/dir-item.c | 23 ++++++++++++ fs/btrfs/inode.c | 80 ++++++++++++++++++++++++++++++++++++---- 4 files changed, 125 insertions(+), 14 deletions(-)
fs/btrfs/delayed-inode.c +27 -5
@@ -1493,9 +1493,9 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, ret =__btrfs_add_delayed_item (delayed_node, delayed_item);if (unlikely (ret)) { +// TODO: It would be nice to print the base64encoded name here maybe? btrfs_err (trans->fs_info, -"err add delayed dir index item(name: %.*s) into the insertion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)" , -fname_len (fname),fname_name (fname), +"err add delayed dir index item into the insertion tree of the delayed node (root id: %llu, inode id: %llu, errno: %d)" , delayed_node->root->root_key.objectid, delayed_node->inode_id, ret);BUG ();
@@ -1728,7 +1728,9 @@ int btrfs_should_delete_dir_index(struct list_head *del_list,* btrfs_readdir_delayed_dir_index - read dir info stored in the delayed tree * */ -int btrfs_readdir_delayed_dir_index (struct dir_context *ctx, +int btrfs_readdir_delayed_dir_index (struct inode *inode, +struct fscrypt_str *fstr, +struct dir_context *ctx,struct list_head *ins_list) {struct btrfs_dir_item *di;
@@ -1738,6 +1740,7 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx,int name_len;int over =0 ;unsigned char d_type; +size_t fstr_len = fstr->len;if (list_empty (ins_list))return 0 ;
@@ -1765,8 +1768,27 @@ int btrfs_readdir_delayed_dir_index(struct dir_context *ctx, d_type =fs_ftype_to_dtype (btrfs_dir_flags_to_ftype (di->type));btrfs_disk_key_to_cpu (&location, &di->location); - over = !dir_emit (ctx, name, name_len, - location.objectid, d_type); +if (di->type &BTRFS_FT_FSCRYPT_NAME ) { +int ret; +struct fscrypt_str iname =FSTR_INIT (name, name_len); + fstr->len = fstr_len; +/* +* The hash is only used when the encryption key is not +* available. But if we have delayed insertions, then we +* must have the encryption key available or we wouldn't +* have been able to create entries in the directory. +* So, we don't calculate the hash. +*/ + ret =fscrypt_fname_disk_to_usr (inode,0 ,0 , &iname, + fstr); +if (ret) +return ret; + over = !dir_emit (ctx, fstr->name, fstr->len, + location.objectid, d_type); + }else { + over = !dir_emit (ctx, name, name_len, location.objectid, + d_type); + }if (refcount_dec_and_test (&curr->refs))kfree (curr);
fs/btrfs/delayed-inode.h +3 -1
@@ -142,7 +142,9 @@ void btrfs_readdir_put_delayed_items(struct inode *inode, struct list_head *del_list);int btrfs_should_delete_dir_index (struct list_head *del_list,u64 index); -int btrfs_readdir_delayed_dir_index (struct dir_context *ctx, +int btrfs_readdir_delayed_dir_index (struct inode *inode, +struct fscrypt_str *fstr, +struct dir_context *ctx,struct list_head *ins_list);/* for init */
fs/btrfs/dir-item.c +23 -0
@@ -120,6 +120,9 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,struct btrfs_disk_key disk_key;u32 data_size; +if (fname->crypto_buf.name) + type |=BTRFS_FT_FSCRYPT_NAME ; + key.objectid =btrfs_ino (dir); key.type =BTRFS_DIR_ITEM_KEY ; key.offset =btrfs_name_hash (fname);
@@ -385,6 +388,18 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,u32 cur =0 ;u32 this_len;struct extent_buffer *leaf; +bool encrypted = (fname->crypto_buf.name !=NULL ); +struct fscrypt_name unencrypted_fname; + +if (encrypted) { + unencrypted_fname = (struct fscrypt_name ){ + .usr_fname = fname->usr_fname, + .disk_name = { + .name = (unsigned char *)fname->usr_fname->name, + .len = fname->usr_fname->len, + }, + }; + } leaf = path->nodes[0 ]; dir_item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dir_item);
@@ -402,6 +417,14 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,return dir_item; } +if (encrypted && +btrfs_dir_name_len (leaf, dir_item) ==fname_len (&unencrypted_fname) && +btrfs_fscrypt_match_name (&unencrypted_fname, leaf, + (unsigned long )(dir_item +1 ), + dir_name_len)) { +return dir_item; + } + cur += this_len; dir_item = (struct btrfs_dir_item *)((char *)dir_item + this_len);
fs/btrfs/inode.c +72 -8
137 lines not on this page · raw message
Signature · 1 line
2.35.1
RFC PATCH v2 15/16 btrfs: encrypt normal file extent data if appropriate
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
Add in the necessary calls to encrypt and decrypt data to achieve encryption of normal data.
--- fs/btrfs/extent_io.c | 56 ++++++++++++++++++++++++++++++++++++----- fs/btrfs/file-item.c | 9 +++++-- fs/btrfs/fscrypt.c | 27 ++++++++++++++++---- fs/btrfs/tree-checker.c | 11 +++++--- 4 files changed, 87 insertions(+), 16 deletions(-)
fs/btrfs/extent_io.c +50 -6
@@ -184,6 +184,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) {struct bio *bio;struct bio_vec *bv; +struct page *first_page;struct inode *inode;int mirror_num;
@@ -192,13 +193,17 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) bio = bio_ctrl->bio; bv =bio_first_bvec_all (bio); - inode = bv->bv_page->mapping->host; + first_page =bio_first_page_all (bio); +if (fscrypt_is_bounce_page (first_page)) + inode =fscrypt_pagecache_page (first_page)->mapping->host; +else + inode = first_page->mapping->host; mirror_num = bio_ctrl->mirror_num;/* Caller should ensure the bio has at least some range added */ ASSERT (bio->bi_iter.bi_size); -btrfs_bio (bio)->file_offset =page_offset (bv->bv_page) + bv->bv_offset; +btrfs_bio (bio)->file_offset =page_offset (first_page) + bv->bv_offset;if (!is_data_inode (inode))btrfs_submit_metadata_bio (inode, bio, mirror_num);
@@ -2836,9 +2841,19 @@ static void end_bio_extent_writepage(struct bio *bio)ASSERT (!bio_flagged (bio,BIO_CLONED ));bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page; -struct inode *inode = page->mapping->host; -struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb); -const u32 sectorsize = fs_info->sectorsize; +struct inode *inode; +struct btrfs_fs_info *fs_info; +u32 sectorsize; +struct page *bounce_page =NULL ; + +if (fscrypt_is_bounce_page (page)) { + bounce_page = page; + page =fscrypt_pagecache_page (bounce_page); + } + + inode = page->mapping->host; + fs_info =btrfs_sb (inode->i_sb); + sectorsize = fs_info->sectorsize;/* Our read/write should always be sector aligned. */ if (!IS_ALIGNED (bvec->bv_offset, sectorsize))
@@ -2859,7 +2874,7 @@ static void end_bio_extent_writepage(struct bio *bio) }end_extent_writepage (page, error, start, end); - +fscrypt_free_bounce_page (bounce_page);btrfs_page_clear_writeback (fs_info, page, start, bvec->bv_len); }
@@ -3058,6 +3073,17 @@ static void end_bio_extent_readpage(struct bio *bio) } } +if (likely (uptodate)) { +if (fscrypt_inode_uses_fs_layer_crypto (inode)) { +int ret =fscrypt_decrypt_pagecache_blocks (page, + bvec->bv_len, + bvec->bv_offset); +if (ret) { + error_bitmap = (unsigned int )-1 ; + uptodate = false; + } + } + }if (likely (uptodate)) {loff_t i_size =i_size_read (inode);pgoff_t end_index = i_size >>PAGE_SHIFT ;
@@ -3415,11 +3441,29 @@ static int submit_extent_page(unsigned int opf, bool force_bio_submit) {int ret =0 ; +struct page *bounce_page =NULL ;struct btrfs_inode *inode =BTRFS_I (page->mapping->host);unsigned int cur = pg_offset;ASSERT (bio_ctrl); +if ((opf &REQ_OP_MASK ) ==REQ_OP_WRITE && +fscrypt_inode_uses_fs_layer_crypto (&inode->vfs_inode)) { +gfp_t gfp_flags =GFP_NOFS ; + +if (bio_ctrl->bio) + gfp_flags =GFP_NOWAIT | __GFP_NOWARN; +else + gfp_flags =GFP_NOFS ; + bounce_page =fscrypt_encrypt_pagecache_blocks (page, size, + pg_offset, + gfp_flags); +if (IS_ERR (bounce_page)) +return PTR_ERR (bounce_page); + page = bounce_page; + pg_offset =0 ; + } +ASSERT (pg_offset <PAGE_SIZE && size <=PAGE_SIZE && pg_offset + size <=PAGE_SIZE );if (force_bio_submit)
fs/btrfs/file-item.c +7 -2
@@ -663,8 +663,13 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio, shash->tfm = fs_info->csum_shash;bio_for_each_segment (bvec, bio, iter) { -if (use_page_offsets) - offset =page_offset (bvec.bv_page) + bvec.bv_offset; +if (use_page_offsets) { +struct page *page = bvec.bv_page; + +if (fscrypt_is_bounce_page (page)) + page =fscrypt_pagecache_page (page); + offset =page_offset (page) + bvec.bv_offset; + }if (!ordered) { ordered =btrfs_lookup_ordered_extent (inode, offset);
fs/btrfs/fscrypt.c +22 -5
@@ -190,11 +190,28 @@ static bool btrfs_fscrypt_empty_dir(struct inode *inode)static void btrfs_fscrypt_get_iv (u8 *iv,int ivsize,struct inode *inode,u64 lblk_num) { -/* -* For encryption that doesn't involve extent data, juse use the -* nonce already loaded into the iv buffer. -*/ -return ; +u64 offset = lblk_num << inode->i_blkbits; +struct extent_map *em; + +if (lblk_num ==0 ) { +/* Must be a filename or a symlink. Just use the nonce. */ +return ; + } + +/* Since IO must be in progress on this extent, this must succeed */ + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , offset,PAGE_SIZE ); +ASSERT (!IS_ERR (em) && em); +if (em) { +__le64 *iv_64 = (__le64 *)iv; +memcpy (iv, em->iv, ivsize); +/* +* Add the lblk_num to the low bits of the IV to ensure +* the IV changes for every page +*/ + *iv_64 =cpu_to_le64 (le64_to_cpu (*iv_64) + lblk_num); +free_extent_map (em); +return ; + } }const struct fscrypt_operations btrfs_fscrypt_ops = {
fs/btrfs/tree-checker.c +8 -3
@@ -273,9 +273,14 @@ static int check_extent_data_item(struct extent_buffer *leaf,return -EUCLEAN ; } -/* Compressed inline extent has no on-disk size, skip it */ -if (btrfs_file_extent_compression (leaf, fi) != -BTRFS_COMPRESS_NONE ) +/* +* Compressed inline extent has no on-disk size; encrypted has +* variable size; skip them +*/ +if ((btrfs_file_extent_compression (leaf, fi) != +BTRFS_COMPRESS_NONE ) || + (btrfs_file_extent_encryption (leaf, fi) != +BTRFS_ENCRYPTION_NONE ))return 0 ;/* Uncompressed inline extent size must match item size */
Signature · 1 line
2.35.1
RFC PATCH v2 16/16 btrfs: implement fscrypt ioctls
In reply to Sweet Tea DorminyFrom: Omar Sandoval <[email protected]>
These ioctls allow encryption to be set up.
--- fs/btrfs/ioctl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
fs/btrfs/ioctl.c +28 -0
@@ -5457,6 +5457,34 @@ long btrfs_ioctl(struct file *file, unsigned intreturn btrfs_ioctl_get_fslabel (fs_info, argp);case FS_IOC_SETFSLABEL :return btrfs_ioctl_set_fslabel (file, argp); +case FS_IOC_SET_ENCRYPTION_POLICY : { +if (!IS_ENABLED (CONFIG_FS_ENCRYPTION )) +return -EOPNOTSUPP ; +if (sb_rdonly (fs_info->sb)) +return -EOPNOTSUPP ; +/* +* If we crash before we commit, nothing encrypted could have +* been written so it doesn't matter whether the encrypted +* state persists. +*/ +btrfs_set_fs_incompat (fs_info,FSCRYPT ); +return fscrypt_ioctl_set_policy (file, (const void __user *)arg); + } +case FS_IOC_GET_ENCRYPTION_POLICY : +return fscrypt_ioctl_get_policy (file, (void __user *)arg); +case FS_IOC_GET_ENCRYPTION_POLICY_EX : +return fscrypt_ioctl_get_policy_ex (file, (void __user *)arg); +case FS_IOC_ADD_ENCRYPTION_KEY : +return fscrypt_ioctl_add_key (file, (void __user *)arg); +case FS_IOC_REMOVE_ENCRYPTION_KEY : +return fscrypt_ioctl_remove_key (file, (void __user *)arg); +case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS : +return fscrypt_ioctl_remove_key_all_users (file, + (void __user *)arg); +case FS_IOC_GET_ENCRYPTION_KEY_STATUS : +return fscrypt_ioctl_get_key_status (file, (void __user *)arg); +case FS_IOC_GET_ENCRYPTION_NONCE : +return fscrypt_ioctl_get_nonce (file, (void __user *)arg);case FITRIM :return btrfs_ioctl_fitrim (fs_info, argp);case BTRFS_IOC_SNAP_CREATE :
Signature · 1 line
2.35.1
Hello,
I see no comment on this RFC. Is there any next version?
Thanks,
Usama
Quoted 95 lines · Sweet Tea Dorminy
This is a draft set of changes adding fscrypt integration to btrfs.
Last October, Omar sent out a design document for having fscrypt integration with btrfs [1]. In summary, it proposes btrfs storing its own encryption IVs on a per-file-extent basis. fscrypt usually encrypts files using an IV derived from per-inode information; this would prevent snapshotting or reflinking or data relocation for btrfs, but by using an IV associated with each file extent, all the inodes sharing a particular key and file extent may decrypt successfully.
This series starts implementing it on the kernel side for the simple case, non-compressed data extents. My goal in sending out this RFC is to get feedback on whether these are going in a reasonable direction; while there are a couple of additional parts, they're fundamentally minor compared to this.
Not included are a couple of minor changes to btrfs-progs; additionally, none of the fscrypt tool changes needed to use the new encryption policy are included. Obviously, additional fstests will be needed. Also not yet included are encryption for inline data extents, verity items, and compressed data.
[1]
https://lore.kernel.org/linux-btrfs/[email protected]/Changelog:
v2:
- Fixed all warnings and known incorrectnesses.
- Split fscrypt changes into their own patchset:https://lore.kernel.org/linux-fscrypt/[email protected]- Combined and reordered changes so that enabling fscrypt is the last change.
- Removed unnecessary factoring.
- Split a cleanup change off.v1:
- https://lore.kernel.org/linux-btrfs/[email protected]Omar Sandoval (13):
btrfs: store directories' encryption state
btrfs: factor afscrypt_namematching method
btrfs: disable various operations on encrypted inodes
btrfs: add fscrypt operation table to superblock
btrfs: start using fscrypt hooks.
btrfs: add a subvolume flag for whole-volume encryption
btrfs: translate btrfs encryption flags and encrypted inode flag.
btrfs: store an IV per encrypted normal file extent
btrfs: Add newFEATURE_INCOMPAT_FSCRYPTfeature flag.
btrfs: reuse encrypted filename hash when possible.
btrfs: adapt directory read and lookup to potentially encrypted
filenames
btrfs: encrypt normal file extent data if appropriate
btrfs: implement fscrypt ioctlsSweet Tea Dorminy (3):
btrfs: use fscrypt_name's instead of name/len everywhere.
btrfs: setupfscrypt_namesfrom dentrys using helper
btrfs: add iv generation function for fscryptfs/btrfs/Makefile | 1 + fs/btrfs/btrfs_inode.h | 3 + fs/btrfs/ctree.h | 113 +++++-- fs/btrfs/delayed-inode.c | 48 ++- fs/btrfs/delayed-inode.h | 9 +- fs/btrfs/dir-item.c | 120 ++++--- fs/btrfs/extent_io.c | 93 +++++- fs/btrfs/extent_io.h | 2 + fs/btrfs/extent_map.h | 8 + fs/btrfs/file-item.c | 20 +- fs/btrfs/file.c | 11 +- fs/btrfs/fscrypt.c | 224 +++++++++++++ fs/btrfs/fscrypt.h | 49 +++ fs/btrfs/inode-item.c | 84 ++--- fs/btrfs/inode-item.h | 14 +- fs/btrfs/inode.c | 547 ++++++++++++++++++++++++-------- fs/btrfs/ioctl.c | 80 ++++- fs/btrfs/ordered-data.c | 12 +- fs/btrfs/ordered-data.h | 3 +- fs/btrfs/print-tree.c | 4 +- fs/btrfs/props.c | 11 +- fs/btrfs/reflink.c | 8 + fs/btrfs/root-tree.c | 20 +- fs/btrfs/send.c | 141 ++++---- fs/btrfs/super.c | 8 +- fs/btrfs/transaction.c | 43 ++- fs/btrfs/tree-checker.c | 56 +++- fs/btrfs/tree-log.c | 261 ++++++++------- fs/btrfs/tree-log.h | 4 +- fs/btrfs/xattr.c | 21 +- include/uapi/linux/btrfs.h | 1 + include/uapi/linux/btrfs_tree.h | 26 ++ 32 files changed, 1525 insertions(+), 520 deletions(-)create mode 100644
fs/btrfs/fscrypt.c
create mode 100644fs/btrfs/fscrypt.h
Quoted 3 lines · Muhammad Usama Anjum
Hello,
I see no comment on this RFC. Is there any next version?
Yes, there will be another version.