A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "FROMLIST: f2fs: fix use-after-free when accessing bio->bi_crypt_context"

Browse source 
This reverts commit ec877350d0.

This is a preparation change for merging android-5.4-stable.50
into msm-5.4 branch. Newer version of the imported change is
committed already as:

4c9af3eb8e f2fs: fix use-after-free when accessing bio->bi_crypt_context

Change-Id: Ie0ff68e50ad1cfe8a3a257b2d24e55a000bbe5c2
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
This commit is contained in:
Blagovest Kolenichev 2020-07-14 22:08:04 -07:00
commit c65e3412df
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
fs/f2fs/data.c
View file

@ -797,10 +797,9 @@ static void del_bio_entry(struct bio_entry *be)
kmem_cache_free(bio_entry_slab, be);
}
static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,
static int add_ipu_page(struct f2fs_sb_info *sbi, struct bio **bio,
struct page *page)
{
struct f2fs_sb_info *sbi = fio->sbi;
enum temp_type temp;
bool found = false;
int ret = -EAGAIN;
@ -817,18 +816,13 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,
found = true;
if (page_is_mergeable(sbi, *bio, *fio->last_block,
fio->new_blkaddr) &&
f2fs_crypt_mergeable_bio(*bio,
fio->page->mapping->host,
fio->page->index, fio) &&
bio_add_page(*bio, page, PAGE_SIZE, 0) ==
PAGE_SIZE) {
if (bio_add_page(*bio, page, PAGE_SIZE, 0) ==
PAGE_SIZE) {
ret = 0;
break;
}
/* page can't be merged into bio; submit the bio */
/* bio is full */
del_bio_entry(be);
__submit_bio(sbi, *bio, DATA);
break;
@ -913,6 +907,11 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
trace_f2fs_submit_page_bio(page, fio);
f2fs_trace_ios(fio, 0);
if (bio && (!page_is_mergeable(fio->sbi, bio, *fio->last_block,
fio->new_blkaddr) ||
!f2fs_crypt_mergeable_bio(bio, fio->page->mapping->host,
fio->page->index, fio)))
f2fs_submit_merged_ipu_write(fio->sbi, &bio, NULL);
alloc_new:
if (!bio) {
bio = __bio_alloc(fio, BIO_MAX_PAGES);
@ -924,7 +923,7 @@ alloc_new:
add_bio_entry(fio->sbi, bio, page, fio->temp);
} else {
if (add_ipu_page(fio, &bio, page))
if (add_ipu_page(fio->sbi, &bio, page))
goto alloc_new;
}