[PATCH] eth: fbnic: Avoid garbage value in fbnic_mac_get_sensor_asic()

[PATCH] eth: fbnic: Avoid garbage value in fbnic_mac_get_sensor_asic()

[Su Hui]

'fw_cmpl' is uninitialized which makes 'sensor' and '*val' to be stored
garbage value. Initialize 'fw_cmpl' with 'fdb->cmpl_data' to fix this
problem.

Fixes: d85ebade02e8 ("eth: fbnic: Add hardware monitoring support via HWMON interface")
Signed-off-by: Su Hui <suhui@nfschina.com>
---
 drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
index 80b82ff12c4d..ab1d1864d7a8 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
@@ -688,15 +688,18 @@ fbnic_mac_get_eth_mac_stats(struct fbnic_dev *fbd, bool reset,
 
 static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id, long *val)
 {
-	struct fbnic_fw_completion fw_cmpl;
+	struct fbnic_fw_completion *fw_cmpl = fbd->cmpl_data;
 	s32 *sensor;
 
+	if (!fw_cmpl)
+		return -EINVAL;
+
 	switch (id) {
 	case FBNIC_SENSOR_TEMP:
-		sensor = &fw_cmpl.tsene.millidegrees;
+		sensor = &fw_cmpl->tsene.millidegrees;
 		break;
 	case FBNIC_SENSOR_VOLTAGE:
-		sensor = &fw_cmpl.tsene.millivolts;
+		sensor = &fw_cmpl->tsene.millivolts;
 		break;
 	default:
 		return -EINVAL;
-- 
2.30.2

Re: [PATCH] eth: fbnic: Avoid garbage value in fbnic_mac_get_sensor_asic()

[Jakub Kicinski]

On Tue, 24 Dec 2024 10:27:29 +0800 Su Hui wrote:
> 'fw_cmpl' is uninitialized which makes 'sensor' and '*val' to be stored
> garbage value. Initialize 'fw_cmpl' with 'fdb->cmpl_data' to fix this
> problem.

Argh, this function should send a FW command to read the sensors, 
it does nothing today :/ Looks like an upstreaming fail..

If you'd like to fix this please just remove the body of the function
entirely and return -EOPNOTSUPP. We'll have to follow up in net-next
to fill in the gaps in sensor reading.
-- 
pw-bot: cr