diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-19 17:00:18 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-30 16:59:26 +0300 |
| commit | d43918aefa224a5e21e656669a21f5717662e903 (patch) | |
| tree | 429d980e434f4f9cd4eadf8f2a44fcbfe6d53d36 /drivers/base | |
| parent | e25b6bafc0accd7c59e131e1099ab22852e36777 (diff) | |
| download | linux-d43918aefa224a5e21e656669a21f5717662e903.tar.xz | |
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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/base')
| -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 a3530dadb163..c11e72f7ab51 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 */ |