[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250416190908.15263-2-thorsten.blum@linux.dev>
Date: Wed, 16 Apr 2025 21:09:07 +0200
From: Thorsten Blum <thorsten.blum@...ux.dev>
To: Dinh Nguyen <dinguyen@...nel.org>,
Thorsten Blum <thorsten.blum@...ux.dev>
Cc: linux-hardening@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] nios2: Replace strcpy() with strscpy() and simplify setup_cpuinfo()
strcpy() is deprecated; use strscpy() instead.
Since the destination buffer has a fixed length, strscpy() automatically
determines its size using sizeof() when the size argument is omitted.
This makes the explicit size argument unnecessary - remove it.
Now, combine both if-else branches using strscpy() and the same buffer
into a single statement to simplify the code.
No functional changes intended.
Link: https://github.com/KSPP/linux/issues/88
Cc: linux-hardening@...r.kernel.org
Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
---
arch/nios2/kernel/cpuinfo.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/nios2/kernel/cpuinfo.c b/arch/nios2/kernel/cpuinfo.c
index 7b1e8f9128e9..55882feb6249 100644
--- a/arch/nios2/kernel/cpuinfo.c
+++ b/arch/nios2/kernel/cpuinfo.c
@@ -46,10 +46,7 @@ void __init setup_cpuinfo(void)
cpuinfo.cpu_clock_freq = fcpu(cpu, "clock-frequency");
str = of_get_property(cpu, "altr,implementation", &len);
- if (str)
- strscpy(cpuinfo.cpu_impl, str, sizeof(cpuinfo.cpu_impl));
- else
- strcpy(cpuinfo.cpu_impl, "<unknown>");
+ strscpy(cpuinfo.cpu_impl, str ?: "<unknown>");
cpuinfo.has_div = of_property_read_bool(cpu, "altr,has-div");
cpuinfo.has_mul = of_property_read_bool(cpu, "altr,has-mul");
--
2.49.0
Powered by blists - more mailing lists