hw/timer/sse-timer: Propagate eventual error in sse_timer_realize()

[PATCH] hw/timer/sse-timer: Propagate eventual error in sse_timer_realize()

Philippe Mathieu-Daudé posted 1 patch 3 years, 1 month ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210312001845.1562670-1-f4bug@amsat.org

hw/timer/sse-timer.c | 1 +
1 file changed, 1 insertion(+)

Expand all Fold all

[PATCH] hw/timer/sse-timer: Propagate eventual error in sse_timer_realize()

Posted by Philippe Mathieu-Daudé 3 years, 1 month ago

If the SSECounter link is absent, we set an error message
in sse_timer_realize() but forgot to propagate this error.
Add the missing 'return'.

Fixes: CID 1450755 (Null pointer dereferences)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/timer/sse-timer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index 8dbe6ac651e..f959cb9d603 100644
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -415,6 +415,7 @@ static void sse_timer_realize(DeviceState *dev, Error **errp)
 
     if (!s->counter) {
         error_setg(errp, "counter property was not set");
+        return;
     }
 
     s->counter_notifier.notify = sse_timer_counter_callback;
-- 
2.26.2

Re: [PATCH] hw/timer/sse-timer: Propagate eventual error in sse_timer_realize()

Posted by Peter Maydell 3 years, 1 month ago

On Fri, 12 Mar 2021 at 00:18, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> If the SSECounter link is absent, we set an error message
> in sse_timer_realize() but forgot to propagate this error.
> Add the missing 'return'.
>
> Fixes: CID 1450755 (Null pointer dereferences)
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/timer/sse-timer.c | 1 +
>  1 file changed, 1 insertion(+)



Applied to target-arm.next, thanks.

-- PMM