Commit 09f8f2c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-fix-v6.10-merge-window' of... 

Merge tag 'regmap-fix-v6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap fix from Mark Brown:
 "Guenter ran with memory sanitisers and found an issue in the new KUnit
  tests that Richard added where an assumption in older test code was
  exposed, this was fixed quickly by Richard"

* tag 'regmap-fix-v6.10-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: kunit: Fix array overflow in stride() test
parents 66ad4829 7ba82218

drivers/base/regmap/regmap-kunit.c

+8 −1
Original line number Diff line number Diff line
@@ -609,12 +609,19 @@ static void stride(struct kunit *test) 
	config.reg_stride = 2;

	config.num_reg_defaults = BLOCK_TEST_SIZE / 2;



	/*

	 * Allow one extra register so that the read/written arrays

	 * are sized big enough to include an entry for the odd

	 * address past the final reg_default register.

	 */

	config.max_register = BLOCK_TEST_SIZE;



	map = gen_regmap(test, &config, &data);

	KUNIT_ASSERT_FALSE(test, IS_ERR(map));

	if (IS_ERR(map))

		return;



	/* Only even registers can be accessed, try both read and write */

	/* Only even addresses can be accessed, try both read and write */

	for (i = 0; i < BLOCK_TEST_SIZE; i++) {

		data->read[i] = false;

		data->written[i] = false;