From: Tony Dinh <mibodhi@gmail.com>
Date: Tue, 3 Jun 2025 04:50:22 +0000 (-0700)
Subject: fs: ext4fs: Fix: Data abort in ext4fs_log_gdt()
X-Git-Tag: v2025.10-rc1~91^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29cb98d515f96c2330455af4b8cace0220abd00c;p=pandora-u-boot.git

fs: ext4fs: Fix: Data abort in ext4fs_log_gdt()

Return ENOMEM in ext4fs_log_gdt when number of blocks per gdt is more than
number of allocated journal entries.

Signed-off-by: Tony Dinh <mibodhi@gmail.com>
---

diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 02c4ac2cb93..868a2c1804a 100644
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -131,6 +131,13 @@ int ext4fs_log_gdt(char *gd_table)
 	struct ext_filesystem *fs = get_fs();
 	short i;
 	long int var = fs->gdtable_blkno;
+
+	/* Make sure there is enough journal entries */
+	if (fs->no_blk_pergdt > MAX_JOURNAL_ENTRIES) {
+		log_err("*** Not enough journal entries allocated\n");
+		return -ENOMEM;
+	}
+
 	for (i = 0; i < fs->no_blk_pergdt; i++) {
 		journal_ptr[gindex]->buf = zalloc(fs->blksz);
 		if (!journal_ptr[gindex]->buf)