8abcb1d6b2
Include security fixes and other recent "stable" fixes OBS-URL: https://build.opensuse.org/request/show/664459 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=445
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Fri, 14 Dec 2018 14:08:07 +0100
|
|
Subject: hw/s390x: Fix bad mask in time2tod()
|
|
|
|
Since "s390x/tcg: avoid overflows in time2tod/tod2time", the
|
|
time2tod() function tries to deal with the 9 uppermost bits in the
|
|
time value, but uses the wrong mask for this: 0xff80000000000000 should
|
|
be used instead of 0xff10000000000000 here.
|
|
|
|
Fixes: 14055ce53c2d901d826ffad7fb7d6bb8ab46bdfd
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
Message-Id: <1544792887-14575-1-git-send-email-thuth@redhat.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
[CH: tweaked commit message]
|
|
(cherry picked from commit aba7a5a2de3dba5917024df25441f715b9249e31)
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
include/hw/s390x/tod.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
|
|
index 413c0d7c02..442f45b2f5 100644
|
|
--- a/include/hw/s390x/tod.h
|
|
+++ b/include/hw/s390x/tod.h
|
|
@@ -50,7 +50,7 @@ typedef struct S390TODClass {
|
|
/* Converts ns to s390's clock format */
|
|
static inline uint64_t time2tod(uint64_t ns)
|
|
{
|
|
- return (ns << 9) / 125 + (((ns & 0xff10000000000000ull) / 125) << 9);
|
|
+ return (ns << 9) / 125 + (((ns & 0xff80000000000000ull) / 125) << 9);
|
|
}
|
|
|
|
/* Converts s390's clock format to ns */
|