mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Armin Wolf <W_Armin@gmx.de>
To: rafael@kernel.org, lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] ACPI: battery: Replace strncpy() with strscpy()
Date: Sat, 14 Jan 2023 09:50:52 +0100	[thread overview]
Message-ID: <20230114085053.72059-4-W_Armin@gmx.de> (raw)
In-Reply-To: <20230114085053.72059-1-W_Armin@gmx.de>

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


  parent reply	other threads:[~2023-01-14  8:51 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-14  8:50 [PATCH 0/4] ACPI: battery: Fix various string handling issues Armin Wolf
2023-01-14  8:50 ` [PATCH 1/4] ACPI: battery: Fix missing NUL-termination with large strings Armin Wolf
2023-01-19 13:34   ` Rafael J. Wysocki
2023-01-14  8:50 ` [PATCH 2/4] ACPI: battery: Fix buffer overread if not NUL-terminated Armin Wolf
2023-01-17 14:42   ` Rafael J. Wysocki
2023-01-17 21:01     ` Armin Wolf
2023-01-18 15:00       ` Rafael J. Wysocki
2023-01-14  8:50 ` Armin Wolf [this message]
2023-01-17 14:44   ` [PATCH 3/4] ACPI: battery: Replace strncpy() with strscpy() Rafael J. Wysocki
2023-01-14  8:50 ` [PATCH 4/4] ACPI: battery: Increase maximum string length Armin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230114085053.72059-4-W_Armin@gmx.de \
    --to=w_armin@gmx.de \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®