Skip to contentSkip to conversation

dm-integrity: dont replay journal data past the end of the device

PATCH New Mikulas Patocka 1 participant 1 message Jan 30, 2020 Device mapper

lore
Share & tools
lore

Mikulas Patocka

author maintainer
#0 lore raw

PATCH 1/3 dm-integrity: dont replay journal data past the end of the device

The following patches 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.

---
 drivers/md/dm-integrity.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/md/dm-integrity.c +4 -0
Index: linux-2.6/drivers/md/dm-integrity.c
===================================================================
@@ -2205,6 +2205,8 @@ static void do_journal_write(struct dm_i
 					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++) {
@@ -2214,6 +2216,8 @@ static void do_journal_write(struct dm_i
 					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;