From: kmpfqgdwxucqz9@gmail.com
To: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
KernelKraze <admin@mail.free-proletariat.dpdns.org>
Subject: [PATCH 1/1] btrfs: add integer overflow protection to flush_dir_items_batch allocation
Date: Wed, 30 Jul 2025 13:43:48 +0900 [thread overview]
Message-ID: <20250730044348.133387-2-admin@mail.free-proletariat.dpdns.org> (raw)
In-Reply-To: <20250730044348.133387-1-admin@mail.free-proletariat.dpdns.org>
From: KernelKraze <admin@mail.free-proletariat.dpdns.org>
The flush_dir_items_batch() function performs memory allocation using
count * sizeof(u32) + count * sizeof(struct btrfs_key) without proper
integer overflow checking. When count is large enough, this multiplication
can overflow, resulting in an allocation smaller than expected, leading to
buffer overflows during subsequent array access.
In extreme cases with very large directory item counts, this could
theoretically lead to undersized memory allocation, though such scenarios
are unlikely in normal filesystem usage.
Fix this by:
1. Adding a reasonable upper limit (195) to the batch size, consistent
with the limit used in log_delayed_insertion_items()
2. Using check_mul_overflow() and check_add_overflow() to detect integer
overflows before performing the allocation
3. Returning -EOVERFLOW when overflow is detected
4. Adding appropriate warning and error messages for debugging
This ensures that memory allocations are always sized correctly and
prevents potential issues from integer overflow conditions, improving
overall code robustness.
Signed-off-by: KernelKraze <admin@mail.free-proletariat.dpdns.org>
---
fs/btrfs/tree-log.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 9f05d454b9df..19b443314db0 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3655,14 +3655,35 @@ static int flush_dir_items_batch(struct btrfs_trans_handle *trans,
} else {
struct btrfs_key *ins_keys;
u32 *ins_sizes;
+ size_t keys_size, sizes_size, total_size;
- ins_data = kmalloc(count * sizeof(u32) +
- count * sizeof(struct btrfs_key), GFP_NOFS);
+ /*
+ * Prevent integer overflow when calculating allocation size.
+ * We use the same reasonable limit as log_delayed_insertion_items()
+ * to prevent excessive memory allocation and potential DoS.
+ */
+ if (count > 195) {
+ btrfs_warn(inode->root->fs_info,
+ "dir items batch size %d exceeds safe limit, truncating",
+ count);
+ count = 195;
+ }
+
+ /* Check for overflow in size calculations */
+ if (check_mul_overflow(count, sizeof(u32), &sizes_size) ||
+ check_mul_overflow(count, sizeof(struct btrfs_key), &keys_size) ||
+ check_add_overflow(sizes_size, keys_size, &total_size)) {
+ btrfs_err(inode->root->fs_info,
+ "integer overflow in batch allocation size calculation");
+ return -EOVERFLOW;
+ }
+
+ ins_data = kmalloc(total_size, GFP_NOFS);
if (!ins_data)
return -ENOMEM;
ins_sizes = (u32 *)ins_data;
- ins_keys = (struct btrfs_key *)(ins_data + count * sizeof(u32));
+ ins_keys = (struct btrfs_key *)(ins_data + sizes_size);
batch.keys = ins_keys;
batch.data_sizes = ins_sizes;
batch.total_data_size = 0;
--
2.48.1
next prev parent reply other threads:[~2025-07-30 4:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-30 4:43 [PATCH 0/1] btrfs: strengthen integer overflow protection in batch allocation kmpfqgdwxucqz9
2025-07-30 4:43 ` kmpfqgdwxucqz9 [this message]
2025-07-30 6:35 ` [PATCH 1/1] btrfs: add integer overflow protection to flush_dir_items_batch allocation Johannes Thumshirn
2025-07-30 6:58 ` kmpfqgdwxucqz9
2025-07-30 7:06 ` Qu Wenruo
2025-07-30 7:20 ` [PATCH 1/1] btrfs: add integer overflow protection to flush_dir_items_batch allocation - WITHDRAWN kmpfqgdwxucqz9
2025-07-30 10:20 ` [PATCH 1/1] btrfs: add integer overflow protection to flush_dir_items_batch allocation Filipe Manana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250730044348.133387-2-admin@mail.free-proletariat.dpdns.org \
--to=kmpfqgdwxucqz9@gmail.com \
--cc=admin@mail.free-proletariat.dpdns.org \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).