Commit 2214ec4b authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Andrew Morton
Browse files

ocfs2: fix memory leak in ocfs2_merge_rec_left() 

In 'ocfs2_merge_rec_left()', do not reset 'left_path' to NULL after
move, thus allowing 'ocfs2_free_path()' to free it before return.

Link: https://lkml.kernel.org/r/20251205065159.392749-1-dmantipov@yandex.ru


Fixes: 677b9752 ("ocfs2: Add support for cross extent block")
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Reported-by: default avatar <syzbot+cfc7cab3bb6eaa7c4de2@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=cfc7cab3bb6eaa7c4de2


Reviewed-by: default avatarHeming Zhao <heming.zhao@suse.com>
Acked-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7efb45f9

fs/ocfs2/alloc.c

+0 −1
Original line number Diff line number Diff line
@@ -3655,7 +3655,6 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 
			 * So we use the new rightmost path.

			 */

			ocfs2_mv_path(right_path, left_path);

			left_path = NULL;

		} else

			ocfs2_complete_edge_insert(handle, left_path,

						   right_path, subtree_index);