]> git.karo-electronics.de Git - linux-beck.git/commitdiff
regmap: rbtree: Fix overlapping rbnodes.
authorDavid Jander <david@protonic.nl>
Wed, 21 Aug 2013 15:37:22 +0000 (17:37 +0200)
committerMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 16:03:54 +0000 (17:03 +0100)
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 <david@protonic.nl>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
drivers/base/regmap/regcache-rbtree.c

index 5c1435c4e210c9311e01e92e9a0039ec89df2bdb..0fccc99881fdc55013ea0ad11d17091c7e8b642d 100644 (file)
@@ -332,7 +332,7 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg)
        }
 
        if (!rbnode->blklen) {
-               rbnode->blklen = sizeof(*rbnode);
+               rbnode->blklen = 1;
                rbnode->base_reg = reg;
        }