diff options
| author | Mikulas Patocka <[email protected]> | 2020-03-22 20:42:23 +0100 |
|---|---|---|
| committer | Mike Snitzer <[email protected]> | 2020-03-24 12:43:21 -0400 |
| commit | f6f72f32c22c0ba7b714685b13a257be981888f3 (patch) | |
| tree | 67dfdfe4de50ff5926172acd49936bc29c1303d9 | |
| parent | 7649194a1636ab5876e7c18337d7ddd63e1d4376 (diff) | |
dm integrity: don't replay journal data past the end of the device
Following commits will make it possible to shrink or extend the device. If
the device was shrunk, we don't want to replay journal data pointing past
the end of the device.
Signed-off-by: Mikulas Patocka <[email protected]>
Signed-off-by: Mike Snitzer <[email protected]>
| -rw-r--r-- | drivers/md/dm-integrity.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 8ce69355b8dc..3c10a672322f 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -2194,6 +2194,8 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start, sec &= ~(sector_t)(ic->sectors_per_block - 1); } } + if (unlikely(sec >= ic->provided_data_sectors)) + continue; get_area_and_offset(ic, sec, &area, &offset); restore_last_bytes(ic, access_journal_data(ic, i, j), je); for (k = j + 1; k < ic->journal_section_entries; k++) { @@ -2203,6 +2205,8 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start, break; BUG_ON(unlikely(journal_entry_is_inprogress(je2)) && !from_replay); sec2 = journal_entry_get_sector(je2); + if (unlikely(sec2 >= ic->provided_data_sectors)) + break; get_area_and_offset(ic, sec2, &area2, &offset2); if (area2 != area || offset2 != offset + ((k - j) << ic->sb->log2_sectors_per_block)) break; |