Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'regmap-fix-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fix from Mark Brown:
 "regmap: Fix handling of present bits on rbtree cache block resize

  When expanding a cache block we use krealloc() to resize the register
  present bitmap without initialising the newly allocated data (the
  original code was written for kzalloc()).  Add an appropraite memset()
  to fix that"

* tag 'regmap-fix-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: regcache-rbtree: Clean new present bits on present bitmap resize
parents 58ccab91 8ef9724b

drivers/base/regmap/regcache-rbtree.c

+14 −5
Original line number Diff line number Diff line
@@ -296,13 +296,22 @@ static int regcache_rbtree_insert_to_block(struct regmap *map, 
	if (!blk)

		return -ENOMEM;



	if (BITS_TO_LONGS(blklen) > BITS_TO_LONGS(rbnode->blklen)) {

		present = krealloc(rbnode->cache_present,

		    BITS_TO_LONGS(blklen) * sizeof(*present), GFP_KERNEL);

				   BITS_TO_LONGS(blklen) * sizeof(*present),

				   GFP_KERNEL);

		if (!present) {

			kfree(blk);

			return -ENOMEM;

		}



		memset(present + BITS_TO_LONGS(rbnode->blklen), 0,

		       (BITS_TO_LONGS(blklen) - BITS_TO_LONGS(rbnode->blklen))

		       * sizeof(*present));

	} else {

		present = rbnode->cache_present;

	}



	/* insert the register value in the correct place in the rbnode block */

	if (pos == 0) {

		memmove(blk + offset * map->cache_word_size,