From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Dmitry Osipenko" <digetx@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH] hw/ptimer: Assert next_event is newer than last_event
Date: Sat, 21 Sep 2019 12:17:03 +0200 [thread overview]
Message-ID: <20190921101703.17935-1-philmd@redhat.com> (raw)
If the period is too big, the 'delta * period' product result
might overflow, resulting in a negative number, then the
next_event ends before the last_event. This is buggy, as there
is no forward progress. Assert this can not happen.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/core/ptimer.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index d58e2dfdb0..88085d4c81 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -125,6 +125,9 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)
s->last_event = s->next_event;
s->next_event = s->last_event + delta * period;
+ /* Verify forward progress */
+ g_assert(s->next_event > s->last_event);
+
if (period_frac) {
s->next_event += ((int64_t)period_frac * delta) >> 32;
}
--
2.20.1
next reply other threads:[~2019-09-21 10:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-21 10:17 Philippe Mathieu-Daudé [this message]
2019-09-23 14:40 ` [PATCH] hw/ptimer: Assert next_event is newer than last_event Peter Maydell
2019-09-23 14:54 ` Philippe Mathieu-Daudé
2019-09-23 15:08 ` Peter Maydell
2019-09-23 15:11 ` Philippe Mathieu-Daudé
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=20190921101703.17935-1-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=digetx@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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;
as well as URLs for NNTP newsgroup(s).