]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: validate: Validate maximum start time for <clock offset='absolute'>
authorPeter Krempa <pkrempa@redhat.com>
Thu, 3 Nov 2022 15:04:17 +0000 (16:04 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 4 Nov 2022 08:54:33 +0000 (09:54 +0100)
Glib can internally convert only unix timestamps up to
9999-12-31T23:59:59 (253402300799). Validate that the user doesn't use
more than that as otherwise we cause an assertion failure:

 (process:1183396): GLib-CRITICAL **: 14:25:00.906: g_date_time_format: assertion 'datetime != NULL' failed

Additionally adjust the schema to allow bigger values as we use
'unsigned long long' to parse the value.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2128993
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/schemas/domaincommon.rng
src/qemu/qemu_validate.c
tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args
tests/qemuxml2argvdata/clock-absolute.xml
tests/qemuxml2xmloutdata/clock-absolute.x86_64-latest.xml

index ebb39de3ef14f031988c1993c0d387fceb7c3988..cefe818044da50c4ae9c102885f359026dbf8aae 100644 (file)
               <value>absolute</value>
             </attribute>
             <attribute name="start">
-              <ref name="unsignedInt"/>
+              <ref name="unsignedLong"/>
             </attribute>
           </group>
         </choice>
index 1456a69351f8cd0cfd88d10e9dccc56deaf58df8..1d4081e47eecdf45c0ba66b6d21da894bc2d95ab 100644 (file)
@@ -663,6 +663,23 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
         }
     }
 
+    switch ((virDomainClockOffsetType) def->clock.offset) {
+    case VIR_DOMAIN_CLOCK_OFFSET_ABSOLUTE:
+        /* maximum timestamp glib can convert is 9999-12-31T23:59:59 */
+        if (def->clock.data.starttime > 253402300799) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("The maximum 'start' value for <clock offset='absolute'> is 253402300799"));
+            return -1;
+        }
+
+    case VIR_DOMAIN_CLOCK_OFFSET_UTC:
+    case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME:
+    case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE:
+    case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE:
+    case VIR_DOMAIN_CLOCK_OFFSET_LAST:
+        break;
+    }
+
     return 0;
 }
 
index 75fc162cee086357fa13208c6e92f862d5f00a13..af64bc0f1a4cd990cf68a383346e751af02cde35 100644 (file)
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=1970-01-01T00:20:34 \
+-rtc base=9999-12-31T23:59:59 \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
index e79f53ed3cf72fec2ea31bd109619a23bd91c3bf..63ef7f6f33696051def90583e4eabba6bdfe7b87 100644 (file)
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <clock offset='absolute' start='1234'/>
+  <clock offset='absolute' start='253402300799'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
index b313a740393e396357b6520134f77c4697e77ca4..eea68677d5d396c01acf4e71202d8963d65055f8 100644 (file)
@@ -11,7 +11,7 @@
   <cpu mode='custom' match='exact' check='none'>
     <model fallback='forbid'>qemu64</model>
   </cpu>
-  <clock offset='absolute' start='1234'/>
+  <clock offset='absolute' start='253402300799'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>