Commit cccd0337 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.15/dm-fixes-2' of... 

Merge tag 'for-6.15/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mikulas Patocka:

 - fix reading past the end of allocated memory

 - fix missing dm_put_live_table() in dm_keyslot_evict()

* tag 'for-6.15/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: fix copying after src array boundaries
  dm: add missing unlock on in dm_keyslot_evict()
parents 01f95500 f1aff4bc

drivers/md/dm-table.c

+3 −2
Original line number Diff line number Diff line
@@ -524,9 +524,9 @@ static char **realloc_argv(unsigned int *size, char **old_argv) 
	}

	argv = kmalloc_array(new_size, sizeof(*argv), gfp);

	if (argv) {

		*size = new_size;

		if (old_argv)

			memcpy(argv, old_argv, *size * sizeof(*argv));

		*size = new_size;

	}



	kfree(old_argv);
@@ -1173,7 +1173,7 @@ static int dm_keyslot_evict(struct blk_crypto_profile *profile, 


	t = dm_get_live_table(md, &srcu_idx);

	if (!t)

		return 0;

		goto put_live_table;



	for (unsigned int i = 0; i < t->num_targets; i++) {

		struct dm_target *ti = dm_table_get_target(t, i);
@@ -1184,6 +1184,7 @@ static int dm_keyslot_evict(struct blk_crypto_profile *profile, 
					  (void *)key);

	}



put_live_table:

	dm_put_live_table(md, srcu_idx);

	return 0;

}