[PATCH] Replace strncpy with strscpy to ensure null-termination

kendrajmoore posted 1 patch 10 months, 3 weeks ago
tools/power/x86/turbostat/turbostat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] Replace strncpy with strscpy to ensure null-termination
Posted by kendrajmoore 10 months, 3 weeks ago
From: Kendra Moore <kendra.j.moore3443@gmail.com>

The field pcounter->name is used as a null-terminated string.
Using strncpy() with ARRAY_SIZE - 1 does not guarantee
null-termination and can lead to undefined behavior if the source
is too long.

This patch replaces it with strscpy() which ensures
null-termination and returns an error code if truncation occurs.

Signed-off-by: Kendra Moore <kendra.j.moore3443@gmail.com>
---
 tools/power/x86/turbostat/turbostat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 8d5011a0bf60..8f24e18d3de0 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -9345,7 +9345,7 @@ int pmt_add_counter(unsigned int guid, unsigned int seq, const char *name, enum
 	}
 
 	if (new_counter) {
-		strncpy(pcounter->name, name, ARRAY_SIZE(pcounter->name) - 1);
+		strscpy(pcounter->name, name, ARRAY_SIZE(pcounter->name));
 		pcounter->type = type;
 		pcounter->scope = scope;
 		pcounter->lsb = lsb;
-- 
2.39.5
Re: [PATCH] Replace strncpy with strscpy to ensure null-termination
Posted by Len Brown 8 months ago
On Sun, Mar 23, 2025 at 10:31 AM kendrajmoore
<kendra.j.moore3443@gmail.com> wrote:

> --- a/tools/power/x86/turbostat/turbostat.c

> +               strscpy(pcounter->name, name, ARRAY_SIZE(pcounter->name));

Nope --  strscpy() is kernel specific, not available to user space utilities.

Len Brown, Intel Open Source Technology Center