| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 19 Jun 2020 00:27:44 +0900
From: Wang Shilong <wangshilong1991@...il.com>
To: linux-ext4@...r.kernel.org
Cc: lixi@....com, adilger@...ger.ca, wangshilong1991@...il.com,
sihara@....com, Wang Shilong <wshilong@....com>
Subject: [RFC PATCH v2 41/51] e2fsck: merge encrypted_files after threads finish
From: Wang Shilong <wshilong@....com>
Signed-off-by: Wang Shilong <wshilong@....com>
---
e2fsck/e2fsck.h | 1 +
e2fsck/encrypted_files.c | 175 +++++++++++++++++++++++++++++++++------
e2fsck/pass1.c | 12 ++-
3 files changed, 160 insertions(+), 28 deletions(-)
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 153f2e21..4a4f1098 100644
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -585,6 +585,7 @@ __u32 find_encryption_policy(e2fsck_t ctx, ext2_ino_t ino);
void destroy_encryption_policy_map(e2fsck_t ctx);
void destroy_encrypted_file_info(e2fsck_t ctx);
+int merge_two_encrypted_files(e2fsck_t src_ctx, e2fsck_t dest_ctx);
/* extents.c */
errcode_t e2fsck_rebuild_extents_later(e2fsck_t ctx, ext2_ino_t ino);
diff --git a/e2fsck/encrypted_files.c b/e2fsck/encrypted_files.c
index 16be2d6d..40540963 100644
--- a/e2fsck/encrypted_files.c
+++ b/e2fsck/encrypted_files.c
@@ -280,6 +280,9 @@ out:
static int handle_nomem(e2fsck_t ctx, struct problem_context *pctx,
size_t size_needed)
{
+ if (!pctx)
+ return -ENOMEM;
+
pctx->num = size_needed;
fix_problem(ctx, PR_1_ALLOCATE_ENCRYPTED_INODE_LIST, pctx);
/* Should never get here */
@@ -287,11 +290,155 @@ static int handle_nomem(e2fsck_t ctx, struct problem_context *pctx,
return 0;
}
+static int increase_file_ranges_capacity(e2fsck_t ctx,
+ struct encrypted_file_info *info,
+ struct problem_context *pctx)
+{
+ int size = sizeof(struct encrypted_file_range);
+
+ if (info->file_ranges_count == info->file_ranges_capacity) {
+ /* Double the capacity by default. */
+ size_t new_capacity = info->file_ranges_capacity * 2;
+
+ /* ... but go from 0 to 128 right away. */
+ if (new_capacity < 128)
+ new_capacity = 128;
+
+ /* We won't need more than the filesystem's inode count. */
+ if (new_capacity > ctx->fs->super->s_inodes_count)
+ new_capacity = ctx->fs->super->s_inodes_count;
+
+ /* To be safe, ensure the capacity really increases. */
+ if (new_capacity < info->file_ranges_capacity + 1)
+ new_capacity = info->file_ranges_capacity + 1;
+
+ if (ext2fs_resize_mem(info->file_ranges_capacity * size,
+ new_capacity * size, &info->file_ranges) != 0)
+ return handle_nomem(ctx, pctx,
+ new_capacity * size);
+
+ info->file_ranges_capacity = new_capacity;
+ }
+
+ return 0;
+}
+
+int find_entry_insert(e2fsck_t dest_ctx,
+ struct encrypted_file_range *insert_range)
+{
+ size_t l, r, m;
+ struct encrypted_file_range *range;
+ int merge_left = 0, merge_right = 0;
+ struct encrypted_file_info *dest_info = dest_ctx->encrypted_files;
+ int ret;
+
+ l = 0;
+ r = dest_info->file_ranges_count;
+ if (r < 1)
+ return -EINVAL;
+
+ while (l < r) {
+ m = l + (r - l) / 2;
+ range = &dest_info->file_ranges[m];
+
+ if (insert_range->first_ino < range->first_ino)
+ r = m;
+ else if (insert_range->first_ino > range->last_ino)
+ l = m + 1;
+ else /* should not happen */ {
+ return -EINVAL;
+ }
+ }
+
+ /* check wheather it could be merged left */
+ if (l >= 1) {
+ range = &dest_info->file_ranges[l - 1];
+ if (range->last_ino + 1 ==
+ insert_range->first_ino &&
+ range->policy_id == insert_range->policy_id) {
+ range->last_ino = insert_range->last_ino;
+ merge_left = 1;
+ }
+ }
+
+ /* check wheather it could be merged right */
+ if (l < dest_info->file_ranges_count - 1) {
+ range = &dest_info->file_ranges[l + 1];
+ if (range->first_ino ==
+ insert_range->last_ino + 1 &&
+ range->policy_id == insert_range->policy_id) {
+ range->first_ino = insert_range->first_ino;
+ merge_right = 1;
+ }
+ }
+ /* check if we could shrink array */
+ if (merge_left && merge_right) {
+ for (m = l; m < dest_info->file_ranges_count - 1;
+ m++)
+ dest_info->file_ranges[m] =
+ dest_info->file_ranges[m + 1];
+
+ dest_info->file_ranges_count--;
+ return 0;
+ } else if (merge_left || merge_right) { /* return directly */
+ return 0;
+ }
+
+ ret = increase_file_ranges_capacity(dest_ctx, dest_info, NULL);
+ if (ret)
+ return ret;
+
+ /* move forward */
+ for (m = dest_info->file_ranges_count; m >= l; m--)
+ dest_info->file_ranges[m + 1] =
+ dest_info->file_ranges[m];
+
+ dest_info->file_ranges[l] = *insert_range;
+ dest_info->file_ranges_count++;
+ return 0;
+}
+
+int merge_two_encrypted_files(e2fsck_t src_ctx, e2fsck_t dest_ctx)
+{
+ struct encrypted_file_info *src_info = src_ctx->encrypted_files;
+ struct encrypted_file_info *dest_info = dest_ctx->encrypted_files;
+ struct encrypted_file_range *range;
+ __u32 policy_id;
+ errcode_t retval;
+ size_t i;
+
+ /* nothing to merge */
+ if (!src_info)
+ return 0;
+
+ if (!dest_info) {
+ dest_ctx->encrypted_files = src_info;
+ src_ctx->encrypted_files = NULL;
+ return 0;
+ }
+
+ for (i = 0; i < src_info->file_ranges_count; i++) {
+ range = &src_info->file_ranges[i];
+ retval = get_encryption_policy_id(dest_ctx, range->first_ino,
+ &policy_id);
+ if (retval != 0)
+ return retval;
+ /* reset policy id */
+ range->policy_id = policy_id;
+ retval = find_entry_insert(dest_ctx, range);
+ if (retval)
+ return retval;
+ }
+
+ return 0;
+}
+
static int append_ino_and_policy_id(e2fsck_t ctx, struct problem_context *pctx,
ext2_ino_t ino, __u32 policy_id)
{
struct encrypted_file_info *info = ctx->encrypted_files;
struct encrypted_file_range *range;
+ int ret;
/* See if we can just extend the last range. */
if (info->file_ranges_count > 0) {
@@ -310,32 +457,10 @@ static int append_ino_and_policy_id(e2fsck_t ctx, struct problem_context *pctx,
}
}
/* Nope, a new range is needed. */
+ ret = increase_file_ranges_capacity(ctx, info, pctx);
+ if (ret)
+ return ret;
- if (info->file_ranges_count == info->file_ranges_capacity) {
- /* Double the capacity by default. */
- size_t new_capacity = info->file_ranges_capacity * 2;
-
- /* ... but go from 0 to 128 right away. */
- if (new_capacity < 128)
- new_capacity = 128;
-
- /* We won't need more than the filesystem's inode count. */
- if (new_capacity > ctx->fs->super->s_inodes_count)
- new_capacity = ctx->fs->super->s_inodes_count;
-
- /* To be safe, ensure the capacity really increases. */
- if (new_capacity < info->file_ranges_capacity + 1)
- new_capacity = info->file_ranges_capacity + 1;
-
- if (ext2fs_resize_mem(info->file_ranges_capacity *
- sizeof(*range),
- new_capacity * sizeof(*range),
- &info->file_ranges) != 0)
- return handle_nomem(ctx, pctx,
- new_capacity * sizeof(*range));
-
- info->file_ranges_capacity = new_capacity;
- }
range = &info->file_ranges[info->file_ranges_count++];
range->first_ino = ino;
range->last_ino = ino;
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index ac3ffa7b..06e7d753 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2288,9 +2288,6 @@ void _e2fsck_pass1(e2fsck_t ctx)
ext2fs_close_inode_scan(scan);
scan = NULL;
- /* We don't need the encryption policy => ID map any more */
- destroy_encryption_policy_map(ctx);
-
if (ctx->ea_block_quota_blocks) {
ea_refcount_free(ctx->ea_block_quota_blocks);
ctx->ea_block_quota_blocks = 0;
@@ -3045,6 +3042,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
ext2_refcount_t ea_inode_refs = global_ctx->ea_inode_refs;
ext2fs_block_bitmap block_found_map = global_ctx->block_found_map;
ext2fs_block_bitmap block_dup_map = global_ctx->block_dup_map;
+ struct encrypted_file_info *dest_info = global_ctx->encrypted_files;
#ifdef HAVE_SETJMP_H
jmp_buf old_jmp;
@@ -3079,6 +3077,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
global_ctx->ea_block_quota_inodes = ea_block_quota_inodes;
global_ctx->block_ea_map = block_ea_map;
global_ctx->ea_inode_refs = ea_inode_refs;
+ global_ctx->encrypted_files = dest_info;
PASS1_MERGE_CTX_COUNT(global_ctx, thread_ctx, fs_directory_count);
PASS1_MERGE_CTX_COUNT(global_ctx, thread_ctx, fs_regular_count);
PASS1_MERGE_CTX_COUNT(global_ctx, thread_ctx, fs_blockdev_count);
@@ -3130,6 +3129,12 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
global_ctx->invalid_inode_table_flag = invalid_inode_table_flag;
global_ctx->invalid_bitmaps = invalid_bitmaps;
e2fsck_pass1_merge_invalid_bitmaps(global_ctx, thread_ctx);
+ retval = merge_two_encrypted_files(thread_ctx, global_ctx);
+ if (retval) {
+ com_err(global_ctx->program_name, 0,
+ _("while merging encrypted files"));
+ return retval;
+ }
/*
* PASS1_COPY_CTX_BITMAP might return directly from this function,
@@ -3198,6 +3203,7 @@ static int e2fsck_pass1_thread_join(e2fsck_t global_ctx, e2fsck_t thread_ctx)
ea_refcount_free(thread_ctx->refcount_orig);
thread_ctx->refcount_orig = NULL;
}
+ destroy_encrypted_file_info(thread_ctx);
e2fsck_free_dir_info(thread_ctx);
ext2fs_free_mem(&thread_ctx);
--
2.25.4
Powered by blists - more mailing lists