]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
regmap: debugfs: Avoid overflows for very small reads
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 10 Dec 2012 16:14:11 +0000 (01:14 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 10 Dec 2012 16:29:39 +0000 (01:29 +0900)
If count is less than the size of a register then we may hit integer
wraparound when trying to move backwards to check if we're still in
the buffer. Instead move the position forwards to check if it's still
in the buffer, we are unlikely to be able to allocate a buffer
sufficiently big to overflow here.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
drivers/base/regmap/regmap-debugfs.c

index 00fbd58706b22f1ae54bf33697aa1a730a4e5725..3df274e06062443968035ca47a2a14d53164d196 100644 (file)
@@ -93,7 +93,7 @@ static ssize_t regmap_read_debugfs(struct regmap *map, unsigned int from,
                /* If we're in the region the user is trying to read */
                if (p >= *ppos) {
                        /* ...but not beyond it */
-                       if (buf_pos >= count - 1 - map->debugfs_tot_len)
+                       if (buf_pos + 1 + map->debugfs_tot_len >= count)
                                break;
 
                        /* Format the register */