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

Commit 6fbc7be4 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Sahitya Tummala
Browse files

f2fs: avoid wrong decrypted data from disk 



1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet

Change-Id: I6ca2ad656efd230b20caa2240e681dbb9f145394
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Git-commit: 0ded69f632bb717be9aeea3ae74e29050fcb060c
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/


[stummala@codeaurora.org: Back port the change]
Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
parent 88b0ddf6

fs/f2fs/data.c

+10 −8
Original line number Diff line number Diff line
@@ -587,9 +587,6 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, 
		ctx->bio = bio;

		ctx->enabled_steps = post_read_steps;

		bio->bi_private = ctx;



		/* wait the page to be moved by cleaning */

		f2fs_wait_on_block_writeback(sbi, blkaddr);

	}



	return bio;
@@ -607,6 +604,9 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page, 
	if (f2fs_may_encrypt_bio(inode, NULL))

		fscrypt_set_ice_dun(inode, bio, PG_DUN(inode, page));



	/* wait for GCed page writeback via META_MAPPING */

	f2fs_wait_on_block_writeback(inode, blkaddr);



	if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {

		bio_put(bio);

		return -EFAULT;
@@ -1562,6 +1562,12 @@ static int f2fs_mpage_readpages(struct address_space *mapping, 
			if (bio_encrypted)

				fscrypt_set_ice_dun(inode, bio, dun);

		}

		/*

		 * If the page is under writeback, we need to wait for

		 * its completion to see the correct decrypted data.

		 */

		f2fs_wait_on_block_writeback(inode, block_nr);



		if (bio_add_page(bio, page, blocksize, 0) < blocksize)

			goto submit_and_realloc;
@@ -1628,7 +1634,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio) 
		return 0;



	/* wait for GCed page writeback via META_MAPPING */

	f2fs_wait_on_block_writeback(fio->sbi, fio->old_blkaddr);

	f2fs_wait_on_block_writeback(inode, fio->old_blkaddr);



retry_encrypt:

	if (fscrypt_using_hardware_encryption(inode))
@@ -2371,10 +2377,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 


	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed page writeback via META_MAPPING */

	if (f2fs_post_read_required(inode))

		f2fs_wait_on_block_writeback(sbi, blkaddr);



	if (len == PAGE_SIZE || PageUptodate(page))

		return 0;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2800,7 +2800,7 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 
			struct f2fs_io_info *fio, bool add_list);

void f2fs_wait_on_page_writeback(struct page *page,

			enum page_type type, bool ordered);

void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr);

void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr);

void write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

void write_node_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

int lookup_journal_in_cursum(struct f2fs_journal *journal, int type,

fs/f2fs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) 
	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed page writeback via META_MAPPING */

	if (f2fs_post_read_required(inode))

		f2fs_wait_on_block_writeback(sbi, dn.data_blkaddr);

	f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);



out_sem:

	up_read(&F2FS_I(inode)->i_mmap_sem);

fs/f2fs/segment.c

+5 −1
Original line number Diff line number Diff line
@@ -2960,10 +2960,14 @@ void f2fs_wait_on_page_writeback(struct page *page, 
	}

}



void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr)

void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct page *cpage;



	if (!f2fs_post_read_required(inode))

		return;



	if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)

		return;