jbd2: avoid memleak in jbd2_journal_write_metadata_buffer

Kemeng Shi · mehmetb0 · commit 11508b2c1aac · 2024-11-09T18:44:55.000+03:00
BugLink: https://bugs.launchpad.net/bugs/2083656 [ Upstream commit cc102aa24638b90e04364d64e4f58a1fa91a1976 ] The new_bh is from alloc_buffer_head, we should call free_buffer_head to free it in error case. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/20240514112438.1269037-2-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
@@ -399,6 +399,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
 		tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS);
 		if (!tmp) {
 			brelse(new_bh);
+			free_buffer_head(new_bh);
 			return -ENOMEM;
 		}
 		spin_lock(&jh_in->b_state_lock);

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,`
`399`	`399`	`tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS);`
`400`	`400`	`if (!tmp) {`
`401`	`401`	`brelse(new_bh);`
	`402`	`+ free_buffer_head(new_bh);`
`402`	`403`	`return -ENOMEM;`
`403`	`404`	`}`
`404`	`405`	`spin_lock(&jh_in->b_state_lock);`