diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-19 07:00:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 14:49:29 -0700 |
| commit | 08098bda6e983029027548e16a6e796cefa992dc (patch) | |
| tree | e5057ed161ea7a7a4910484824eb81ed01198278 | |
| parent | 9b81b02249202bef870f89c98c9b276e06dc2593 (diff) | |
| download | lwn-08098bda6e983029027548e16a6e796cefa992dc.tar.gz lwn-08098bda6e983029027548e16a6e796cefa992dc.zip | |
regmap: debugfs: Ensure we don't underflow when printing access masks
commit b763ec17ac762470eec5be8ebcc43e4f8b2c2b82 upstream.
If a read is attempted which is smaller than the line length then we may
underflow the subtraction we're doing with the unsigned size_t type so
move some of the calculation to be additions on the right hand side
instead in order to avoid this.
Reported-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 5799a0b9e6cc..1f6cd1583a80 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -432,7 +432,7 @@ static ssize_t regmap_access_read_file(struct file *file, /* If we're in the region the user is trying to read */ if (p >= *ppos) { /* ...but not beyond it */ - if (buf_pos >= count - 1 - tot_len) + if (buf_pos + tot_len + 1 >= count) break; /* Format the register */ |