Skip to contentSkip to conversation

target/ppc: Add lower bound check for watchdogNumber

PATCH Superseded Chinmay Rath 2 participants 3 messages Aug 18

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 target/ppc: Add lower bound check for watchdogNumber

Add missing lower bound check for H_WATCHDOG H_CALL's watchdogNumber parameter as per PAPR documentation ver 12.10.00 section 14.15.5 'H_WATCHDOG'.

---

Changes from v1 : Incorporated changes suggested by Amit.
v1 : https://lore.kernel.org/qemu-devel/[email protected]/

 hw/watchdog/spapr_watchdog.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
hw/watchdog/spapr_watchdog.c +11 -5
index 5b3f50de3a..460b4457a6 100644
@@ -127,6 +127,12 @@ static void watchdog_expired(void *pw)
     }
 }
 
+static inline bool watchdogNumber_valid(target_ulong watchdogNumber,
+                                        SpaprMachineState *spapr)
+{
+    return watchdogNumber >= 1 && watchdogNumber <= ARRAY_SIZE(spapr->wds);
+}
+
 static target_ulong h_watchdog(PowerPCCPU *cpu,
                                SpaprMachineState *spapr,
                                target_ulong opcode, target_ulong *args)
@@ -145,7 +151,7 @@ static target_ulong h_watchdog(PowerPCCPU *cpu,
 
     switch (operation) {
     case PSERIES_WDTF_OP_START:
-        if (watchdogNumber > ARRAY_SIZE(spapr->wds)) {
+        if (!watchdogNumber_valid(watchdogNumber, spapr)) {
             return H_P2;
         }
         if (timeoutInMs <= WDT_MIN_TIMEOUT) {
@@ -170,11 +176,11 @@ static target_ulong h_watchdog(PowerPCCPU *cpu,
     case PSERIES_WDTF_OP_STOP:
         if (watchdogNumber == PSERIES_WDT_STOP_ALL) {
             ret = watchdog_stop_all(spapr);
-        } else if (watchdogNumber <= ARRAY_SIZE(spapr->wds)) {
+        } else if (!watchdogNumber_valid(watchdogNumber, spapr)) {
+            return H_P2;
+        } else {
             ret = watchdog_stop(watchdogNumber,
                                 &spapr->wds[watchdogNumber - 1]);
-        } else {
-            return H_P2;
         }
         break;
     case PSERIES_WDTF_OP_QUERY:
@@ -184,7 +190,7 @@ static target_ulong h_watchdog(PowerPCCPU *cpu,
         trace_spapr_watchdog_query(args[0]);
         break;
     case PSERIES_WDTF_OP_QUERY_LPM:
-        if (watchdogNumber > ARRAY_SIZE(spapr->wds)) {
+        if (!watchdogNumber_valid(watchdogNumber, spapr)) {
             return H_P2;
         }
         args[0] = PSERIES_WDTQL_QUERY_NOT_STOPPED;
Signature · 1 line
2.55.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Chinmay Rath

Add missing lower bound check for H_WATCHDOG H_CALL's watchdogNumber parameter as per PAPR documentation ver 12.10.00 section 14.15.5 'H_WATCHDOG'.

---

Changes from v1 : Incorporated changes suggested by Amit.

Thanks for the quick v2 — the helper and the OP_STOP restructuring look good. One remaining nit below.

Quoted 10 lines

v1 : https://lore.kernel.org/qemu-devel/[email protected]/

 hw/watchdog/spapr_watchdog.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
hw/watchdog/spapr_watchdog.c +0 -0
index 5b3f50de3a..460b4457a6 100644

hw/watchdog/spapr_watchdog.c static void watchdog_expired(void *pw) · line 130

Quoted 4 lines
hw/watchdog/spapr_watchdog.c +1 -0
@@ -127,6 +127,12 @@ static void watchdog_expired(void *pw)
     }
 }
 
+static inline bool watchdogNumber_valid(target_ulong watchdogNumber,

The function name watchdogNumber_valid mixes camelCase with snake_case. Per the QEMU coding style (docs/devel/style.rst), CamelCase is reserved for structured type names and typedefs — regular function names follow lower_case_with_underscores. This should be watchdog_number_valid.

With that fixed:

Thanks,
Amit

#2 lore raw
Quoted 25 lines · Amit Machhiwal
Quoted 8 lines · Chinmay Rath

Add missing lower bound check for H_WATCHDOG H_CALL's watchdogNumber parameter as per PAPR documentation ver 12.10.00 section 14.15.5 'H_WATCHDOG'.

---

Changes from v1 : Incorporated changes suggested by Amit.

Thanks for the quick v2 — the helper and the OP_STOP restructuring look good. One remaining nit below.

Quoted 13 lines

v1 : https://lore.kernel.org/qemu-devel/[email protected]/

  hw/watchdog/spapr_watchdog.c | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
hw/watchdog/spapr_watchdog.c +0 -0
index 5b3f50de3a..460b4457a6 100644
@@ -127,6 +127,12 @@ static void watchdog_expired(void *pw)
      }
  }
 
Quoted 5 lines

hw/watchdog/spapr_watchdog.c static void watchdog_expired(void *pw) · line 130

Quoted 1 line
hw/watchdog/spapr_watchdog.c +1 -0
+static inline bool watchdogNumber_valid(target_ulong watchdogNumber,

The function name watchdogNumber_valid mixes camelCase with snake_case. Per the QEMU coding style (docs/devel/style.rst), CamelCase is reserved for structured type names and typedefs — regular function names follow lower_case_with_underscores. This should be watchdog_number_valid.

Hey thanks for letting me know. I have posted the correct patch retaining your R-by.
I had gone ahead with this naming cause the variable itself was named 'watchdogNumber'.
But going though the qemu coding style, since watchdogNumber is not a 'structured' type, I guess it should have been named in snake case and not camel case in the first place.

Regards,
Chinmay

Quoted 8 lines

With that fixed:

Thanks,
Amit