Skip to contentSkip to conversation

regulator: core: use snprintf() instead of scnprintf()

PATCH In review Bartosz Golaszewski 2 participants 2 messages Mar 6, 2017 – Mar 7, 2017 Voltage and current regulator framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: core: use snprintf() instead of scnprintf()

When creating the link to the device sysfs entry, the regulator core calls scnprintf() and then checks if the returned value is greater or equal than the buffer size.

The former can never happen as scnprintf() returns the number of bytes that were actually written to the buffer, not the bytes that *would* have been written.

Use the right function in this case: snprintf().

---
 drivers/regulator/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/core.c +2 -2
index 53d4fc7..f20ad0a 100644
@@ -1326,8 +1326,8 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 		regulator->dev = dev;
 
 		/* Add a link to the device sysfs entry */
-		size = scnprintf(buf, REG_STR_SIZE, "%s-%s",
-				 dev->kobj.name, supply_name);
+		size = snprintf(buf, REG_STR_SIZE, "%s-%s",
+				dev->kobj.name, supply_name);
 		if (size >= REG_STR_SIZE)
 			goto overflow_err;
 
Signature · 1 line
2.9.3
maintainer
#1 lore raw

Applied "regulator: core: use snprintf() instead of scnprintf()" to the regulator tree

The patch

regulator: core: use snprintf() instead of scnprintf()

has been applied to the regulator tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.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 b7cd1b1386ff46e60452ad1f16530645761ca7b8 Mon Sep 17 00:00:00 2001

From: Bartosz Golaszewski <[email protected]>
Date: Mon, 6 Mar 2017 17:34:48 +0100
Subject: [PATCH] regulator: core: use snprintf() instead of scnprintf()

When creating the link to the device sysfs entry, the regulator core calls scnprintf() and then checks if the returned value is greater or equal than the buffer size.

The former can never happen as scnprintf() returns the number of bytes that were actually written to the buffer, not the bytes that *would* have been written.

Use the right function in this case: snprintf().

---
 drivers/regulator/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/core.c +2 -2
index 53d4fc70dbd0..f20ad0a8fc38 100644
@@ -1326,8 +1326,8 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,
 		regulator->dev = dev;
 
 		/* Add a link to the device sysfs entry */
-		size = scnprintf(buf, REG_STR_SIZE, "%s-%s",
-				 dev->kobj.name, supply_name);
+		size = snprintf(buf, REG_STR_SIZE, "%s-%s",
+				dev->kobj.name, supply_name);
 		if (size >= REG_STR_SIZE)
 			goto overflow_err;
 
Signature · 1 line
2.11.0