Applied "regmap: debugfs: use snprintf return value in regmap_reg_ranges_read_file()" to the regmap tree
Subsystems (2)
Mark Brown
maintainerThe patch
regmap: debugfs: use snprintf return value in regmap_reg_ranges_read_file()
has been applied to the regmap tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
e34dc490713f8d9dfbbb5bb56d966d90a9344131Mon Sep 17 00:00:00 2001
From: Rasmus Villemoes <[email protected]>
Date: Wed, 30 Sep 2015 20:30:25 +0200
Subject: [PATCH] regmap: debugfs: use snprintf return value in
regmap_reg_ranges_read_file()
Calling strlen() no less than three times on entry is silly. Since we're formatting into a buffer with plenty of room, there's no chance of truncation, so snprintf() has actually returned the value we want, meaning we don't even have to call strlen once.
--- drivers/base/regmap/regmap-debugfs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/base/regmap/regmap-debugfs.c +6 -5
@@ -337,6 +337,7 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,char *buf;char *entry;int ret; +unsigned entry_len;if (*ppos <0 || !count)return -EINVAL ;
@@ -364,18 +365,18 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file, p =0 ;mutex_lock (&map->cache_lock);list_for_each_entry (c, &map->debugfs_off_cache, list) { -snprintf (entry,PAGE_SIZE ,"%x-%x" , - c->base_reg, c->max_reg); + entry_len =snprintf (entry,PAGE_SIZE ,"%x-%x" , + c->base_reg, c->max_reg);if (p >= *ppos) { -if (buf_pos +1 +strlen (entry) > count) +if (buf_pos +1 + entry_len > count)break ;snprintf (buf + buf_pos, count - buf_pos,"%s" , entry); - buf_pos +=strlen (entry); + buf_pos += entry_len; buf[buf_pos] ='\n' ; buf_pos++; } - p +=strlen (entry) +1 ; + p += entry_len +1 ; }mutex_unlock (&map->cache_lock);
Signature · 1 line
2.5.0