lkml.org 
[lkml]   [2023]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/4] ACPI: battery: Replace strncpy() with strscpy()
Date
Currently, strncpy() and manual NUL-termination is used
when copying integers. Switch to strscpy() which takes care
of NUL-terminating the result.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/acpi/battery.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9f6daa9f2010..b39b84b8f3ae 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -449,8 +449,7 @@ static int extract_package(struct acpi_battery *battery,

break;
case ACPI_TYPE_INTEGER:
- strncpy(ptr, (u8 *)&element->integer.value, sizeof(u64));
- ptr[sizeof(u64)] = 0;
+ strscpy(ptr, (u8 *)&element->integer.value, sizeof(u64) + 1);

break;
default:
--
2.30.2
\
 
 \ /
  Last update: 2023-03-26 23:41    [W:0.218 / U:0.452 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site