github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ACPI: battery: Sanitise model_number by dropping unprintable characters

Browse Source 
The battery Embedded Controller (EC) may return the model name with
trailing unprintable or non-ASCII characters. For example, on some
systems:

$ cat /sys/class/power_supply/BAT0/model_name
LNV-5B10W51864��

If a non-ASCII or an unprintable character is found, it will be
replaced with '\0' to ensure the model_number is a valid string.

If left intact, the malformed string prevents udev rules and hwdb
working correctly.

Link: https://gitlab.freedesktop.org/upower/upower/-/work_items/345
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
[ rjw: Subject tweak ]
Link: https://patch.msgid.link/20260710125122.1621877-1-hpa@redhat.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Kate Hsuan 2026-07-10 20:51:22 +08:00 committed by Rafael J. Wysocki
parent 1590cf0329
commit 6587dd8759
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/acpi/battery.c
View File

@ -10,6 +10,7 @@
#define pr_fmt(fmt) "ACPI: battery: " fmt
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/dmi.h>
#include <linux/jiffies.h>
@ -483,6 +484,15 @@ static int acpi_battery_get_status(struct acpi_battery *battery)
return 0;
}
static void acpi_battery_clean_unprintable_chars(char *str, size_t length)
{
for (unsigned int i = 0; i < length; i++) {
if (!isascii(str[i]) || !isprint(str[i])) {
str[i] = '\0';
break;
}
}
}
static int extract_battery_info(const int use_bix,
struct acpi_battery *battery,
@ -524,6 +534,10 @@ static int extract_battery_info(const int use_bix,
battery->capacity_now > battery->full_charge_capacity)
battery->capacity_now = battery->full_charge_capacity;
if (!result)
acpi_battery_clean_unprintable_chars(battery->model_number,
ARRAY_SIZE(battery->model_number));
return result;
}