Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bf6b267 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: set dentry bits on random location in memory 



This fixes pointer panic when using inline_dentry, which was triggered when
backporting to 3.10.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c2a080ae

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d, 
	de->ino = cpu_to_le32(ino);

	set_de_type(de, mode);

	for (i = 0; i < slots; i++) {

		test_and_set_bit_le(bit_pos + i, (void *)d->bitmap);

		__set_bit_le(bit_pos + i, (void *)d->bitmap);

		/* avoid wrong garbage data for readdir */

		if (i)

			(de + i)->name_len = 0;

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	inline_dentry = inline_data_addr(page);

	bit_pos = dentry - inline_dentry->dentry;

	for (i = 0; i < slots; i++)

		test_and_clear_bit_le(bit_pos + i,

		__clear_bit_le(bit_pos + i,

				&inline_dentry->dentry_bitmap);



	set_page_dirty(page);