Skip to contentSkip to conversation

i2c: sun6i-pw2i: Prefer strscpy over strlcpy

PATCH Applied Len Baker 2 participants 2 messages Aug 17, 2021

Subsystems (2)
lore
Share & tools
lore

Len Baker

author
#0 lore raw

PATCH 1/1 i2c: sun6i-pw2i: Prefer strscpy over strlcpy

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated. The safe replacement is strscpy().

This is a previous step in the path to remove the strlcpy() function entirely from the kernel [1].

[1] https://github.com/KSPP/linux/issues/89

---
 drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-sun6i-p2wi.c +1 -1
index 2f6f6468214d..9e3483f507ff 100644
@@ -234,7 +234,7 @@ static int p2wi_probe(struct platform_device *pdev)
 	if (IS_ERR(p2wi->regs))
 		return PTR_ERR(p2wi->regs);
 
-	strlcpy(p2wi->adapter.name, pdev->name, sizeof(p2wi->adapter.name));
+	strscpy(p2wi->adapter.name, pdev->name, sizeof(p2wi->adapter.name));
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
 		return irq;

--
2.25.1

Applied
#1 lore raw
Quoted 11 lines · Len Baker

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated. The safe replacement is strscpy().

This is a previous step in the path to remove the strlcpy() function entirely from the kernel [1].

[1] https://github.com/KSPP/linux/issues/89

Applied to for-next, thanks!