summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 01:14:11 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 01:29:39 +0900
commitdb04328c167ff8e7c57f4a3532214aeada3a82fd (patch)
treea1c57616c3007b6d4fbb29a28f144ec89302917e /drivers/base
parentcbc1938badc31f43ab77e92a9b1a51c4fe8b4113 (diff)
downloadlinux-db04328c167ff8e7c57f4a3532214aeada3a82fd.tar.bz2
regmap: debugfs: Avoid overflows for very small reads
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
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-debugfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 00fbd58706b2..3df274e06062 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -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 */