Skip to contentSkip to conversation

accessibility: speakup: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Dec 5, 2022 Speakup console speech driver

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 accessibility: speakup: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings.
---
change for v2
- fix the mistake of eating one character when len > 250,
thanks to Samuel Thibault.
---

---
 drivers/accessibility/speakup/kobjects.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/accessibility/speakup/kobjects.c +1 -2
index a7522d409802..c1ef48280f3c 100644
@@ -426,8 +426,7 @@ static ssize_t synth_direct_store(struct kobject *kobj,
 	spin_lock_irqsave(&speakup_info.spinlock, flags);
 	while (len > 0) {
 		bytes = min_t(size_t, len, 250);
-		strncpy(tmp, ptr, bytes);
-		tmp[bytes] = '\0';
+		strscpy(tmp, ptr, bytes + 1);
 		string_unescape_any_inplace(tmp);
 		synth_printf("%s", tmp);
 		ptr += bytes;
Signature · 1 line
2.15.2
maintainer Reviewed-by on v2 1/1
#1 lore raw

[email protected], le lun. 05 déc. 2022 19:28:46 +0800, a ecrit:

Quoted 10 lines

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings.
---
change for v2
- fix the mistake of eating one character when len > 250,
thanks to Samuel Thibault.
---

Quoted 3 lines

It's not really a signed-off from my side, I just did a review :)

but with that version,

Quoted 21 lines
---
 drivers/accessibility/speakup/kobjects.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/accessibility/speakup/kobjects.c +1 -2
index a7522d409802..c1ef48280f3c 100644
@@ -426,8 +426,7 @@ static ssize_t synth_direct_store(struct kobject *kobj,
 	spin_lock_irqsave(&speakup_info.spinlock, flags);
 	while (len > 0) {
 		bytes = min_t(size_t, len, 250);
-		strncpy(tmp, ptr, bytes);
-		tmp[bytes] = '\0';
+		strscpy(tmp, ptr, bytes + 1);
 		string_unescape_any_inplace(tmp);
 		synth_printf("%s", tmp);
 		ptr += bytes;
Signature · 1 line
2.15.2
Signature · 4 lines
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.