forked from Openwrt-EcoNet/openwrt
7d064eef52
Backports an upstream fix ([1]) for a build regression of 'drivers/power/supply' with GCC15 -Wunterminated-string-initialization. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=77f5bb150132bbbcd6bc37ffdc80c9e140e373a4 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com> Link: https://github.com/openwrt/openwrt/pull/18950 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
From 77f5bb150132bbbcd6bc37ffdc80c9e140e373a4 Mon Sep 17 00:00:00 2001
|
|
From: Kees Cook <kees@kernel.org>
|
|
Date: Wed, 16 Apr 2025 15:27:41 -0700
|
|
Subject: [PATCH] power: supply: sysfs: Remove duplicate NUL termination
|
|
|
|
GCC 15's new -Wunterminated-string-initialization notices that one of
|
|
the sysfs attr strings would lack the implicit trailing NUL byte during
|
|
initialization:
|
|
|
|
drivers/power/supply/power_supply_sysfs.c:183:57: warning: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (32 chars into 31 available) [-Wunterminated-string-initialization]
|
|
183 | POWER_SUPPLY_ATTR(CHARGE_CONTROL_START_THRESHOLD),
|
|
| ^
|
|
drivers/power/supply/power_supply_sysfs.c:36:23: note: in definition of macro '_POWER_SUPPLY_ATTR'
|
|
36 | .attr_name = #_name "\0", \
|
|
| ^~~~~
|
|
drivers/power/supply/power_supply_sysfs.c:183:9: note: in expansion of macro 'POWER_SUPPLY_ATTR'
|
|
183 | POWER_SUPPLY_ATTR(CHARGE_CONTROL_START_THRESHOLD),
|
|
| ^~~~~~~~~~~~~~~~~
|
|
|
|
However, the macro used was explicitly adding a trailing NUL byte (which
|
|
is not needed). Remove this to avoid the GCC warning. No binary
|
|
differences are seen after this change (there was always run for a NUL
|
|
byte, it's just that the _second_ NUL byte was getting truncated).
|
|
|
|
Signed-off-by: Kees Cook <kees@kernel.org>
|
|
Link: https://lore.kernel.org/r/20250416222740.work.569-kees@kernel.org
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
|
|
--- a/drivers/power/supply/power_supply_sysfs.c
|
|
+++ b/drivers/power/supply/power_supply_sysfs.c
|
|
@@ -32,7 +32,7 @@ struct power_supply_attr {
|
|
[POWER_SUPPLY_PROP_ ## _name] = \
|
|
{ \
|
|
.prop_name = #_name, \
|
|
- .attr_name = #_name "\0", \
|
|
+ .attr_name = #_name, \
|
|
.text_values = _text, \
|
|
.text_values_len = _len, \
|
|
}
|