On Fri, Jul 14, 2023 at 11:58:43PM +0800, Weichao Guo wrote:
> As the fscrypt context has two versions now, this patch adds the
> support of fscrypt_context_v2 for print_xattr_entry.
>
> Signed-off-by: Weichao Guo <[email protected]>
> Signed-off-by: Sheng Yong <[email protected]>
> ---
> fsck/mount.c | 46 +++++++++++++++++++++++++++++---------------
> fsck/xattr.h | 54 +++++++++++++++++++++++++++++++++++++++++++---------
> 2 files changed, 76 insertions(+), 24 deletions(-)
>
> diff --git a/fsck/mount.c b/fsck/mount.c
> index df0314d..fce01d1 100644
> --- a/fsck/mount.c
> +++ b/fsck/mount.c
> @@ -194,7 +194,7 @@ static void print_xattr_entry(const struct
> f2fs_xattr_entry *ent)
> {
> const u8 *value = (const u8 *)&ent->e_name[ent->e_name_len];
> const int size = le16_to_cpu(ent->e_value_size);
> - const struct fscrypt_context *ctx;
> + const union fscrypt_context *ctx;
> int i;
>
> MSG(0, "\nxattr: e_name_index:%d e_name:", ent->e_name_index);
> @@ -211,22 +211,38 @@ static void print_xattr_entry(const struct
> f2fs_xattr_entry *ent)
> return;
> #endif
> case F2FS_XATTR_INDEX_ENCRYPTION:
> - ctx = (const struct fscrypt_context *)value;
> - if (size != sizeof(*ctx) ||
> - ctx->format != FS_ENCRYPTION_CONTEXT_FORMAT_V1)
> + ctx = (const union fscrypt_context *)value;
> + if (size != fscrypt_context_size(ctx))
> break;
> - MSG(0, "format: %d\n", ctx->format);
If size == 0, this will read past the end of the xattr value.
> - MSG(0, "contents_encryption_mode: 0x%x\n",
> ctx->contents_encryption_mode);
> - MSG(0, "filenames_encryption_mode: 0x%x\n",
> ctx->filenames_encryption_mode);
> - MSG(0, "flags: 0x%x\n", ctx->flags);
> - MSG(0, "master_key_descriptor: ");
> - for (i = 0; i < FS_KEY_DESCRIPTOR_SIZE; i++)
> - MSG(0, "%02X", ctx->master_key_descriptor[i]);
> - MSG(0, "\nnonce: ");
> - for (i = 0; i < FS_KEY_DERIVATION_NONCE_SIZE; i++)
> - MSG(0, "%02X", ctx->nonce[i]);
> - MSG(0, "\n");
> + switch (ctx->version) {
> + case FSCRYPT_CONTEXT_V1:
> + MSG(0, "format: %d\n", ctx->version);
> + MSG(0, "contents_encryption_mode: 0x%x\n",
> ctx->v1.contents_encryption_mode);
> + MSG(0, "filenames_encryption_mode: 0x%x\n",
> ctx->v1.filenames_encryption_mode);
> + MSG(0, "flags: 0x%x\n", ctx->v1.flags);
> + MSG(0, "master_key_descriptor: ");
> + for (i = 0; i < FSCRYPT_KEY_DESCRIPTOR_SIZE; i++)
> + MSG(0, "%02X",
> ctx->v1.master_key_descriptor[i]);
> + MSG(0, "\nnonce: ");
> + for (i = 0; i < FSCRYPT_FILE_NONCE_SIZE; i++)
> + MSG(0, "%02X", ctx->v1.nonce[i]);
> + MSG(0, "\n");
> return;
> + case FSCRYPT_CONTEXT_V2:
> + MSG(0, "format: %d\n", ctx->version);
> + MSG(0, "contents_encryption_mode: 0x%x\n",
> ctx->v2.contents_encryption_mode);
> + MSG(0, "filenames_encryption_mode: 0x%x\n",
> ctx->v2.filenames_encryption_mode);
> + MSG(0, "flags: 0x%x\n", ctx->v2.flags);
> + MSG(0, "master_key_identifier: ");
> + for (i = 0; i < FSCRYPT_KEY_IDENTIFIER_SIZE; i++)
> + MSG(0, "%02X",
> ctx->v2.master_key_identifier[i]);
> + MSG(0, "\nnonce: ");
> + for (i = 0; i < FSCRYPT_FILE_NONCE_SIZE; i++)
> + MSG(0, "%02X", ctx->v2.nonce[i]);
> + MSG(0, "\n");
> + return;
> + }
> + break;
The two return statements are missing a level of indentation.
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
