diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-19 07:12:34 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-10-27 22:14:04 -0400 |
| commit | ae4fe5668480212519ca1013ab482720af8bf639 (patch) | |
| tree | 4bf08d3a7160ecac745b84b8488411d6a72f48f7 | |
| parent | d669c8ed8a13c891eb8e5a4007fb3e6705d28716 (diff) | |
| download | linux-stable-ae4fe5668480212519ca1013ab482720af8bf639.tar.gz linux-stable-ae4fe5668480212519ca1013ab482720af8bf639.tar.bz2 linux-stable-ae4fe5668480212519ca1013ab482720af8bf639.zip | |
regmap: debugfs: Don't bother actually printing when calculating max length
[ Upstream commit 176fc2d5770a0990eebff903ba680d2edd32e718 ]
The in kernel snprintf() will conveniently return the actual length of
the printed string even if not given an output beffer at all so just do
that rather than relying on the user to pass in a suitable buffer,
ensuring that we don't need to worry if the buffer was truncated due to
the size of the buffer passed in.
Reported-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 1f6cd1583a80..c8941f39c919 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -32,8 +32,7 @@ static DEFINE_MUTEX(regmap_debugfs_early_lock); /* Calculate the length of a fixed format */ static size_t regmap_calc_reg_len(int max_val, char *buf, size_t buf_size) { - snprintf(buf, buf_size, "%x", max_val); - return strlen(buf); + return snprintf(NULL, 0, "%x", max_val); } static ssize_t regmap_name_read_file(struct file *file, |