From: Sweet Tea Dorminy <[email protected]> Encrypted inodes have a new associated item, the fscrypt context, which can be printed as a pure hex string in dump-tree.
Signed-off-by: Sweet Tea Dorminy <[email protected]> Signed-off-by: Daniel Vacek <[email protected]> --- check/main.c | 2 ++ kernel-shared/print-tree.c | 20 ++++++++++++++++++++ kernel-shared/uapi/btrfs_tree.h | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/check/main.c b/check/main.c index a32247b3..2df55edc 100644 --- a/check/main.c +++ b/check/main.c @@ -1896,6 +1896,8 @@ static int process_one_leaf(struct btrfs_root *root, struct extent_buffer *eb, break; case BTRFS_VERITY_DESC_ITEM_KEY: case BTRFS_VERITY_MERKLE_ITEM_KEY: + case BTRFS_FSCRYPT_INODE_CTX_KEY: + case BTRFS_FSCRYPT_CTX_KEY: break; default: error("unknown key (%llu %u %llu) found in leaf %llu", diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 159f0825..d68398e9 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -117,6 +117,20 @@ static void print_dir_item(struct extent_buffer *eb, u32 size, } } +static void print_fscrypt_context(struct extent_buffer *eb, int slot) +{ + int i; + unsigned long ptr = btrfs_item_ptr_offset(eb, slot); + u32 item_size = btrfs_item_size(eb, slot); + u8 ctx_buf[item_size]; + + read_extent_buffer(eb, ctx_buf, ptr, item_size); + printf("\t\tvalue: "); + for(i = 0; i < item_size; i++) + printf("%02x", ctx_buf[i]); + printf("\n"); +} + static void print_inode_extref_item(struct extent_buffer *eb, u32 size, struct btrfs_inode_extref *extref) { @@ -740,6 +754,8 @@ void print_key_type(FILE *stream, u64 objectid, u8 type) [BTRFS_DIR_LOG_ITEM_KEY] = "DIR_LOG_ITEM", [BTRFS_DIR_LOG_INDEX_KEY] = "DIR_LOG_INDEX", [BTRFS_XATTR_ITEM_KEY] = "XATTR_ITEM", + [BTRFS_FSCRYPT_INODE_CTX_KEY] = "FSCRYPT_INODE_CTX", + [BTRFS_FSCRYPT_CTX_KEY] = "FSCRYPT_CTX", [BTRFS_VERITY_DESC_ITEM_KEY] = "VERITY_DESC_ITEM", [BTRFS_VERITY_MERKLE_ITEM_KEY] = "VERITY_MERKLE_ITEM", [BTRFS_ORPHAN_ITEM_KEY] = "ORPHAN_ITEM", @@ -1556,6 +1572,10 @@ void __btrfs_print_leaf(struct extent_buffer *eb, unsigned int mode) case BTRFS_XATTR_ITEM_KEY: print_dir_item(eb, item_size, ptr); break; + case BTRFS_FSCRYPT_INODE_CTX_KEY: + case BTRFS_FSCRYPT_CTX_KEY: + print_fscrypt_context(eb, i); + break; case BTRFS_DIR_LOG_INDEX_KEY: case BTRFS_DIR_LOG_ITEM_KEY: { struct btrfs_dir_log_item *dlog; diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h index 45675dae..b4532237 100644 --- a/kernel-shared/uapi/btrfs_tree.h +++ b/kernel-shared/uapi/btrfs_tree.h @@ -168,7 +168,8 @@ #define BTRFS_VERITY_DESC_ITEM_KEY 36 #define BTRFS_VERITY_MERKLE_ITEM_KEY 37 -#define BTRFS_FSCRYPT_CTXT_ITEM_KEY 41 +#define BTRFS_FSCRYPT_INODE_CTX_KEY 41 +#define BTRFS_FSCRYPT_CTX_KEY 42 #define BTRFS_ORPHAN_ITEM_KEY 48 /* reserve 2-15 close to the inode for later flexibility */ -- 2.53.0
