path: root/drivers/base
diff options
authorDavid Jander <>2013-08-21 17:37:22 +0200
committerGreg Kroah-Hartman <>2013-09-07 22:10:00 -0700
commit0c6471cc8eb5e6f745b3da21a75096a95548432c (patch)
treee1e8224f9e9fbe83d76dfdaf7eb77cca7ff8ca3b /drivers/base
parent2ac13a8f46246a8a3773bfca0a003f0524cf7cf0 (diff)
regmap: rbtree: Fix overlapping rbnodes.
commit 4e67fb5f5e336250db944921e3c68057d6203034 upstream. Avoid overlapping register regions by making the initial blklen of a new node 1. If a register write occurs to a yet uncached register, that is lower than but near an existing node's base_reg, a new node is created and it's blklen is set to an arbitrary value (sizeof(*rbnode)). That may cause this node to overlap with another node. Those nodes should be merged, but this merge doesn't happen yet, so this patch at least makes the initial blklen small enough to avoid hitting the wrong node, which may otherwise lead to severe breakage. Signed-off-by: David Jander <> Signed-off-by: Mark Brown <> Signed-off-by: Zhouping Liu <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'drivers/base')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 02f490bad30f..bb8c3bbc7812 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -362,7 +362,7 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
rbnode = kzalloc(sizeof *rbnode, GFP_KERNEL);
if (!rbnode)
return -ENOMEM;
- rbnode->blklen = sizeof(*rbnode);
+ rbnode->blklen = 1;
rbnode->base_reg = reg;
rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size,