From: Huisong Li <lihuisong@huawei.com>
To: <linux-hwmon@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <linux@roeck-us.net>, <jdelvare@suse.com>,
<liuyonglong@huawei.com>, <zhanjie9@hisilicon.com>,
<zhenglifeng1@huawei.com>, <lihuisong@huawei.com>
Subject: [PATCH v1 1/4] hwmon: (acpi_power_meter) Fix using uninitialized variables
Date: Mon, 25 Nov 2024 17:34:12 +0800 [thread overview]
Message-ID: <20241125093415.21719-2-lihuisong@huawei.com> (raw)
In-Reply-To: <20241125093415.21719-1-lihuisong@huawei.com>
The 'power1_alarm' attribute uses the 'power' and 'cap' in the
acpi_power_meter_resource structure. However, these two fields are just
updated when user query 'power' and 'cap' attribute, or hardware enforced
limit. If user directly query the 'power1_alarm' attribute without queryng
above two attributes, driver will use the uninitialized variables to judge.
In addition, the 'power1_alarm' attribute needs to update power and cap to
show the real state.
Signed-off-by: Huisong Li <lihuisong@huawei.com>
---
drivers/hwmon/acpi_power_meter.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 2f1c9d97ad21..4c3314e35d30 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -396,6 +396,9 @@ static ssize_t show_val(struct device *dev,
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
u64 val = 0;
+ int ret;
+
+ guard(mutex)(&resource->lock);
switch (attr->index) {
case 0:
@@ -423,6 +426,13 @@ static ssize_t show_val(struct device *dev,
val = 0;
break;
case 6:
+ ret = update_meter(resource);
+ if (ret)
+ return ret;
+ ret = update_cap(resource);
+ if (ret)
+ return ret;
+
if (resource->power > resource->cap)
val = 1;
else
--
2.22.0
next prev parent reply other threads:[~2024-11-25 9:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-25 9:34 [PATCH v1 0/4] hwmon: (acpi_power_meter) Some trival optimizations Huisong Li
2024-11-25 9:34 ` Huisong Li [this message]
2024-11-25 16:03 ` [PATCH v1 1/4] hwmon: (acpi_power_meter) Fix using uninitialized variables Guenter Roeck
2024-11-26 1:56 ` lihuisong (C)
2024-11-26 4:04 ` Guenter Roeck
2024-11-26 7:03 ` lihuisong (C)
2024-11-26 16:19 ` Guenter Roeck
2024-11-27 2:29 ` lihuisong (C)
2024-11-27 3:43 ` lihuisong (C)
2024-12-11 7:41 ` lihuisong (C)
2024-12-12 1:51 ` Guenter Roeck
2024-12-12 3:00 ` lihuisong (C)
2024-12-19 3:45 ` lihuisong (C)
2024-12-19 3:50 ` Guenter Roeck
2024-12-20 6:00 ` lihuisong (C)
2024-11-25 9:34 ` [PATCH v1 2/4] hwmon: (acpi_power_meter) Fix update the power trip points on failure Huisong Li
2024-11-25 15:22 ` Guenter Roeck
2024-11-26 1:59 ` lihuisong (C)
2024-11-25 9:34 ` [PATCH v1 3/4] hwmon: (acpi_power_meter) Remove redundant 'sensors_valid' variable Huisong Li
2024-11-25 15:38 ` Guenter Roeck
2024-11-26 2:25 ` lihuisong (C)
2024-11-25 9:34 ` [PATCH v1 4/4] hwmon: (acpi_power_meter) Add the print of no notification that hardware limit is enforced Huisong Li
2024-11-25 16:13 ` Guenter Roeck
2024-11-26 3:15 ` lihuisong (C)
2024-11-26 4:06 ` Guenter Roeck
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=20241125093415.21719-2-lihuisong@huawei.com \
--to=lihuisong@huawei.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=liuyonglong@huawei.com \
--cc=zhanjie9@hisilicon.com \
--cc=zhenglifeng1@huawei.com \
/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