Commit f8e1ca92 authored by Mikulas Patocka's avatar Mikulas Patocka
Browse files

dm-integrity: fix a race condition when accessing recalc_sector 



There's a race condition when accessing the variable
ic->sb->recalc_sector. The function integrity_recalc writes to this
variable when it makes some progress and the function
dm_integrity_map_continue may read this variable concurrently.

One problem is that on 32-bit architectures the 64-bit variable is not
read and written atomically - it may be possible to read garbage if read
races with write.

Another problem is that memory accesses to this variable are not guarded
with memory barriers.

This commit fixes the race - it moves reading ic->sb->recalc_sector to an
earlier place where we hold &ic->endio_wait.lock.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
parent faada217

drivers/md/dm-integrity.c

+3 −1
Original line number Diff line number Diff line
@@ -2174,6 +2174,7 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_map 
	struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io));

	unsigned int journal_section, journal_entry;

	unsigned int journal_read_pos;

	sector_t recalc_sector;

	struct completion read_comp;

	bool discard_retried = false;

	bool need_sync_io = ic->internal_hash && dio->op == REQ_OP_READ;
@@ -2314,6 +2315,7 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_map 
			goto lock_retry;

		}

	}

	recalc_sector = le64_to_cpu(ic->sb->recalc_sector);

	spin_unlock_irq(&ic->endio_wait.lock);



	if (unlikely(journal_read_pos != NOT_FOUND)) {
@@ -2368,7 +2370,7 @@ static void dm_integrity_map_continue(struct dm_integrity_io *dio, bool from_map 
	if (need_sync_io) {

		wait_for_completion_io(&read_comp);

		if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING) &&

		    dio->range.logical_sector + dio->range.n_sectors > le64_to_cpu(ic->sb->recalc_sector))

		    dio->range.logical_sector + dio->range.n_sectors > recalc_sector)

			goto skip_check;

		if (ic->mode == 'B') {

			if (!block_bitmap_op(ic, ic->recalc_bitmap, dio->range.logical_sector,