diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-08-04 10:22:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-08-04 08:27:10 +0000 |
| commit | 78a688fa830a4e9ff49de221ccc64bc26e54c531 (patch) | |
| tree | af27bd5bb33b5c0bbce17a5c75449a5c0ddf20f8 /fs | |
| parent | ebf4d7ea8dee082eeae0e35c266f184ec8cb3de1 (diff) | |
ANDROID: Revert "f2fs: avoid out-of-range memory access"
This reverts commit 77bd558b2a02356a43b6e38de5168c6bb2afe9e8 which is
commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a upstream.
This is being done because segment.c is a bit "different" in this
branch, and we should keep the f2fs fixes away from here for now.
Otherwise the build breaks.
Change-Id: I014e3381acb1112825f305d47bdf88848ee6fb7f
Cc: Ocean Chen <oceanchen@google.com>
Cc: Jaegeuk Kim <jaegeuk@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/segment.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index a022e2f9faf1..1c7b75a760da 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3073,11 +3073,6 @@ static void read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i = CURSEG_I(sbi, i); segno = le32_to_cpu(ckpt->cur_data_segno[i]); blk_off = le16_to_cpu(ckpt->cur_data_blkoff[i]); - if (blk_off > ENTRIES_IN_SUM) { - f2fs_bug_on(sbi, 1); - f2fs_put_page(page, 1); - return -EFAULT; - } seg_i->next_segno = segno; reset_curseg(sbi, i, 0); seg_i->alloc_type = ckpt->alloc_type[i]; |