From: Stefan Brüns Date: Tue, 6 Sep 2016 02:36:56 +0000 (+0200) Subject: ext4: Fix memory leak of journal buffer if block is updated multiple times X-Git-Tag: v2016.11-rc1~80 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=b1edcf0d8045d0b6929ce8d384fb7b350e3fc9ce;p=pandora-u-boot.git ext4: Fix memory leak of journal buffer if block is updated multiple times If the same block is updated multiple times in a row during a single file system operation, gd_index is decremented to use the same journal entry again. Avoid loosing the already allocated buffer. Signed-off-by: Stefan Brüns --- diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index cf14049c32..5a25be4c8a 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -190,7 +190,11 @@ int ext4fs_put_metadata(char *metadata_buffer, uint32_t blknr) printf("Invalid input arguments %s\n", __func__); return -EINVAL; } - dirty_block_ptr[gd_index]->buf = zalloc(fs->blksz); + if (dirty_block_ptr[gd_index]->buf) + assert(dirty_block_ptr[gd_index]->blknr == blknr); + else + dirty_block_ptr[gd_index]->buf = zalloc(fs->blksz); + if (!dirty_block_ptr[gd_index]->buf) return -ENOMEM; memcpy(dirty_block_ptr[gd_index]->buf, metadata_buffer, fs->blksz);