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 1/4] ACPI: battery: Fix missing NUL-termination with large strings
Date: Sat, 14 Jan 2023 09:50:50 +0100	[thread overview]
Message-ID: <20230114085053.72059-2-W_Armin@gmx.de> (raw)
In-Reply-To: <20230114085053.72059-1-W_Armin@gmx.de>

When encountering a string bigger than the destination buffer (32 bytes),
the string is not properly NUL-terminated, causing buffer overreads later.

This for example happens on the Inspiron 3505, where the battery
model name is larger than 32 bytes, which leads to sysfs showing
the model name together with the serial number string (which is
NUL-terminated and thus prevents worse).

Fix this by using strscpy() which ensures that the result is
always NUL-terminated.

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

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index f4badcdde76e..fb64bd217d82 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -440,7 +440,7 @@ static int extract_package(struct acpi_battery *battery,

 			if (element->type == ACPI_TYPE_STRING ||
 			    element->type == ACPI_TYPE_BUFFER)
-				strncpy(ptr, element->string.pointer, 32);
+				strscpy(ptr, element->string.pointer, 32);
 			else if (element->type == ACPI_TYPE_INTEGER) {
 				strncpy(ptr, (u8 *)&element->integer.value,
 					sizeof(u64));
--
2.30.2


  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 ` Armin Wolf [this message]
2023-01-19 13:34   ` [PATCH 1/4] ACPI: battery: Fix missing NUL-termination with large strings 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 ` [PATCH 3/4] ACPI: battery: Replace strncpy() with strscpy() Armin Wolf
2023-01-17 14:44   ` 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-2-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®