fw_cfg: Allow reboot-timeout=-1 again
PATCH 1/1 fw_cfg: Allow reboot-timeout=-1 again
From: "Dr. David Alan Gilbert" <[email protected]>
Commit ee5d0f89de3e53cdb0dc added range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.
RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/nvram/fw_cfg.c +3 -2
@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }
Signature · 1 line
2.23.0
Quoted 22 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 10 lines
hw/nvram/fw_cfg.c +3
-2+/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }
Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.
I'm too tired right now to risk an opinion on which one we want.
Quoted 22 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 20 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)
Quoted 16 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 12 lines
hw/nvram/fw_cfg.c +3
-2if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.
Thanks for spotting that.
I think Han and also submitted patches to review it from libvirt and it wasn't obvious what to do. (Cc'd Han in).
Quoted 1 line
I'm too tired right now to risk an opinion on which one we want.
As is everyone else ! The problem here is that its documented as a valid thing to do, and libvirt does it, and you might have a current XML file that did it. Now I think you could change libvirt to omit the reboot-timeout parameter if it was called with -1.
So given its a documented thing in both qemu and libvirt xml if we want to remove it then it sohuld be deprecated properly - but it's already broken.
Dave
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 46 lines · Dr. David Alan Gilbert
Quoted 22 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 20 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)Quoted 16 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 12 lines
hw/nvram/fw_cfg.c +3
-2if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.Thanks for spotting that.
I think Han and also submitted patches to review it from libvirt and it wasn't obvious what to do. (Cc'd Han in).Quoted 1 line
I'm too tired right now to risk an opinion on which one we want.
Quoted 8 lines
As is everyone else ! The problem here is that its documented as a valid thing to do, and libvirt does it, and you might have a current XML file that did it. Now I think you could change libvirt to omit the reboot-timeout parameter if it was called with -1.
So given its a documented thing in both qemu and libvirt xml if we want to remove it then it sohuld be deprecated properly - but it's already broken.
Since commit ee5d0f89d, v4.0.0.
If that commit had not made it into a release, we'd certainly treat the loss of "-1 means don't reboot" as regression.
But it has. We can treat it as a regression anyway. We can also declare "ship has sailed".
I'm leaning towads the former.
If we restore "-1 means don't reboot", then I don't see a need to deprecate it. Just keep it.
What do you think?
Quoted 65 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 46 lines · Dr. David Alan Gilbert
Quoted 22 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 20 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)Quoted 16 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 12 lines
hw/nvram/fw_cfg.c +3
-2if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.Thanks for spotting that.
I think Han and also submitted patches to review it from libvirt and it wasn't obvious what to do. (Cc'd Han in).Quoted 1 line
I'm too tired right now to risk an opinion on which one we want.
Quoted 8 lines
As is everyone else ! The problem here is that its documented as a valid thing to do, and libvirt does it, and you might have a current XML file that did it. Now I think you could change libvirt to omit the reboot-timeout parameter if it was called with -1.
So given its a documented thing in both qemu and libvirt xml if we want to remove it then it sohuld be deprecated properly - but it's already broken.
Since commit
ee5d0f89d, v4.0.0.If that commit had not made it into a release, we'd certainly treat the loss of "-1 means don't reboot" as regression.
But it has. We can treat it as a regression anyway. We can also declare "ship has sailed".
Quoted 6 lines
I'm leaning towads the former.
If we restore "-1 means don't reboot", then I don't see a need to deprecate it. Just keep it.
What do you think?
That's also my view; especially since the problem seems to be an easy fix.
Dave
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
However, another important question is: how can we avoid such undocumented incompatibility appears again?
I can show another case caused by such incompatibile change:
https://bugzilla.redhat.com/show_bug.cgi?id=1745868#c0
For the qemu devices, attributes, values, qmp cmds, qmp cmds arguments used by libvirt, could we get a way to inform libvirt
that an incompatibile qemu change is coming, please update libvirt code ASAP to adjust to that change?
Or another way that is more gently: popping up the warning of depreciation instead of dropping it, and then drop it in the version
after next version.
Quoted 86 lines · Dr. David Alan Gilbert
Quoted 9 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 7 lines · Dr. David Alan Gilbert
Quoted 6 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 4 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirtdocument
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeouterror checking")
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s)
Quoted 8 lines
hw/nvram/fw_cfg.c +2
-2if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ - if (rt_val < 0 || rt_val > 0xffff) { +if (rt_val <-1 || rt_val >0xffff ) { error_report("reboot timeout is invalid," - "it should be a value between 0 and65535");
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 254
Quoted 1 line
hw/nvram/fw_cfg.c +1
-0+ "it should be a value between -1 and65535");
Quoted 14 lines
Quoted 14 lines
Quoted 7 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 3 lines
hw/nvram/fw_cfg.c +0
-0exit (1 ); } }Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.Thanks for spotting that.
I think Han and also submitted patches to review it from libvirt and it wasn't obvious what to do. (Cc'd Han in).Quoted 1 line
I'm too tired right now to risk an opinion on which one we want.
Quoted 7 lines
Quoted 7 lines
As is everyone else ! The problem here is that its documented as a valid thing to do, and libvirt does it, and you might have a current XML file that did it. Now I think you could change libvirt to omit the reboot-timeout parameter if it was called with -1.
So given its a documented thing in both qemu and libvirt xml if we want to remove it then it sohuld be deprecated properly - but
it's
Quoted 10 lines
Quoted 1 line
already broken.
Since commit
ee5d0f89d, v4.0.0.If that commit had not made it into a release, we'd certainly treat the loss of "-1 means don't reboot" as regression.
But it has. We can treat it as a regression anyway. We can also declare "ship has sailed".
Quoted 6 lines
I'm leaning towads the former.
If we restore "-1 means don't reboot", then I don't see a need to deprecate it. Just keep it.
What do you think?
That's also my view; especially since the problem seems to be an easy fix.
Dave
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Signature · 8 lines
Best regards, ----------------------------------- Han Han Quality Engineer Redhat. Email: [email protected] Phone: +861065339333
Quoted 2 lines · * Han Han ([email protected]) wrote:
However, another important question is: how can we avoid such undocumented incompatibility appears again?
The reboot-timeout one was accidental - it was a documented qemu feature; just no one noticed it when the input check was added. Officially if we actually want to deprecate a feature we should actually follow qemu's deprecation guidelines.
Quoted 10 lines
I can show another case caused by such incompatibile change:
https://bugzilla.redhat.com/show_bug.cgi?id=1745868#c0For the qemu devices, attributes, values, qmp cmds, qmp cmds arguments used by libvirt, could we get a way to inform libvirt
that an incompatibile qemu change is coming, please update libvirt code ASAP to adjust to that change?
Or another way that is more gently: popping up the warning of depreciation instead of dropping it, and then drop it in the version
after next version.
Yes that should happen; with deprecated devices it's easier than more subtle features like command line things; I'm not sure how that gets introspected. I thought libvirt already asked qemu for a list of devices, so I'm confused why libvirt didn't spot it before starting the VM in 1745868.
Dave
Quoted 82 lines
Quoted 78 lines · Dr. David Alan Gilbert
Quoted 9 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 7 lines · Dr. David Alan Gilbert
Quoted 6 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 4 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirtdocument
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeouterror checking")
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s)
Quoted 8 lines
hw/nvram/fw_cfg.c +2
-2if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 ); +/* validate the input */ - if (rt_val < 0 || rt_val > 0xffff) { +if (rt_val <-1 || rt_val >0xffff ) { error_report("reboot timeout is invalid," - "it should be a value between 0 and65535");
Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 254
Quoted 1 line
hw/nvram/fw_cfg.c +1
-0+ "it should be a value between -1 and65535");
Quoted 14 lines
Quoted 14 lines
Quoted 7 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 3 lines
hw/nvram/fw_cfg.c +0
-0exit (1 ); } }Semantic conflict with "PATCH] qemu-options.hx: Update for reboot-timeout parameter", Message-Id:
<[email protected]>.Thanks for spotting that.
I think Han and also submitted patches to review it from libvirt and it wasn't obvious what to do. (Cc'd Han in).Quoted 1 line
I'm too tired right now to risk an opinion on which one we want.
Quoted 7 lines
Quoted 7 lines
As is everyone else ! The problem here is that its documented as a valid thing to do, and libvirt does it, and you might have a current XML file that did it. Now I think you could change libvirt to omit the reboot-timeout parameter if it was called with -1.
So given its a documented thing in both qemu and libvirt xml if we want to remove it then it sohuld be deprecated properly - but
it's
Quoted 16 lines
Quoted 1 line
already broken.
Since commit
ee5d0f89d, v4.0.0.If that commit had not made it into a release, we'd certainly treat the loss of "-1 means don't reboot" as regression.
But it has. We can treat it as a regression anyway. We can also declare "ship has sailed".
I'm leaning towads the former.
If we restore "-1 means don't reboot", then I don't see a need to deprecate it. Just keep it.
What do you think?
Quoted 19 lines
Quoted 8 lines
That's also my view; especially since the problem seems to be an easy fix.
Dave
--
Dr. David Alan Gilbert / [email protected] / Manchester, UKSignature · 8 lines
Best regards, ----------------------------------- Han Han Quality Engineer Redhat. Email: [email protected] Phone: +861065339333
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 6 lines · Dr. David Alan Gilbert
Quoted 2 lines · * Han Han ([email protected]) wrote:
However, another important question is: how can we avoid such undocumented incompatibility appears again?
The reboot-timeout one was accidental - it was a documented qemu feature; just no one noticed it when the input check was added.
Yes. Mistakes happen. Integration tests can catch them. Perfection is impossible there as well, though.
Quoted 2 lines
Officially if we actually want to deprecate a feature we should actually follow qemu's deprecation guidelines.
Yes.
Quoted 11 lines
Quoted 10 lines
I can show another case caused by such incompatibile change:
https://bugzilla.redhat.com/show_bug.cgi?id=1745868#c0For the qemu devices, attributes, values, qmp cmds, qmp cmds arguments used by libvirt, could we get a way to inform libvirt
that an incompatibile qemu change is coming, please update libvirt code ASAP to adjust to that change?
Or another way that is more gently: popping up the warning of depreciation instead of dropping it, and then drop it in the version
after next version.
Quoted 1 line
Yes that should happen;
No argument. The question is how. I'm working on making it easier to do and easier to consume for QAPI interfaces, i.e. most of QMP.
Quoted 5 lines
with deprecated devices it's easier than more
subtle features like command line things; I'm not sure how that gets introspected. I thought libvirt already asked qemu for a list of devices, so I'm confused why libvirt didn't spot it before starting the VM in 1745868.
Command line isn't really introspectable (see my KVM Forum 2017 talk).
That said, the list of devices *is* introspectable with QMP:
{"execute": "qom-list-types",
"arguments": {"implements": "device", "abstract": false}}I'm not sure what exactly goes wrong in RHBZ 1745868.
Quoted 23 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 10 lines
hw/nvram/fw_cfg.c +3
-2+/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }
Ouch.
Here's the prototype of qemu_opt_get_number():
Quoted 1 line
uint64_tqemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval);
So, when we call it, here's what we actually do:
rt_val = (int64_t)qemu_opt_get_number(opts, "reboot-timeout", (uint64_t)-1);
^^^^^^^^^ ^^^^^^^^^^The conversion to uint64_t is fine.
The conversion to int64_t is not great:
Quoted 3 lines
Otherwise, the new type is signed and the value cannot be represented in it; either the result is implementation-defined or an implementation-defined signal is raised.
I guess we're exploiting two's complement, as the implementation-defined result. Not great. :)
Here's what I'd prefer:
Quoted 15 lines
hw/nvram/fw_cfg.c +1
-1@@ -237,7 +237,7 @@ static void fw_cfg_bootsplash(FWCfgState *s)static void fw_cfg_reboot (FWCfgState *s) {const char *reboot_timeout =NULL ; -int64_t rt_val =-1 ; +uint64_t rt_val =-1 ;uint32_t rt_le32;/* get user configuration */ @@ -248,9 +248,9 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) {
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 256
Quoted 10 lines
hw/nvram/fw_cfg.c +2
-2rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val >0xffff && rt_val != (uint64_t )-1 ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }
(
The trick is that strtoull(), in
qemu_opt_get_number()
qemu_opt_get_number_helper()
parse_option_number()
qemu_strtou64()
strtoull()turns "-1" into (uint64_t)-1, which counts as a valid conversion, per spec:
Quoted 10 lines
If the subject sequence has the expected form and the value of /base/ is zero, the sequence of characters starting with the first digit is interpreted as an integer constant according to the rules of 6.4.4.1. If the subject sequence has the expected form and the value of /base/ is between 2 and 36, it is used as the base for conversion, ascribing to each letter its value as given above. If the subject sequence begins with a minus sign, the value resulting from the conversion is negated (in the return type). A pointer to the final string is stored in the object pointed to by /endptr/, provided that /endptr/ is not a null pointer.
)
I don't insist though; if Phil is OK with the posted patch, I won't try to block it.
Thanks
Laszlo
Quoted 71 lines · * Laszlo Ersek ([email protected]) wrote:
Quoted 23 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 10 lines
hw/nvram/fw_cfg.c +3
-2+/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }Ouch.
Here's the prototype of
qemu_opt_get_number():Quoted 1 line
uint64_tqemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval);So, when we call it, here's what we actually do:
rt_val = (int64_t)qemu_opt_get_number(opts, "reboot-timeout", (uint64_t)-1); ^^^^^^^^^ ^^^^^^^^^^The conversion to
uint64_tis fine.The conversion to
int64_tis not great:Quoted 3 lines
Otherwise, the new type is signed and the value cannot be represented in it; either the result is implementation-defined or an implementation-defined signal is raised.
I guess we're exploiting two's complement, as the implementation-defined result. Not great. :)
Here's what I'd prefer:
Quoted 12 lines
hw/nvram/fw_cfg.c +1
-1@@ -237,7 +237,7 @@ static void fw_cfg_bootsplash(FWCfgState *s)static void fw_cfg_reboot (FWCfgState *s) {const char *reboot_timeout =NULL ; -int64_t rt_val =-1 ; +uint64_t rt_val =-1 ;uint32_t rt_le32;
Quoted 13 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 256
Quoted 13 lines
hw/nvram/fw_cfg.c +2
-2/* get user configuration */ @@ -248,9 +248,9 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val >0xffff && rt_val != (uint64_t )-1 ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }
I think I'm fine with that as well; want to add a signed off and post?
Quoted 4 lines
(
The trick is that
strtoull(), in
Quoted 8 lines
qemu_opt_get_number()qemu_opt_get_number_helper() parse_option_number() qemu_strtou64() strtoull()turns "-1" into (uint64_t)-1, which counts as a valid conversion, per spec:
It's rather scary how much we rely on the grubby depths of the implementations of our conversion routines.
Quoted 11 lines
Quoted 10 lines
If the subject sequence has the expected form and the value of /base/ is zero, the sequence of characters starting with the first digit is interpreted as an integer constant according to the rules of 6.4.4.1. If the subject sequence has the expected form and the value of /base/ is between 2 and 36, it is used as the base for conversion, ascribing to each letter its value as given above. If the subject sequence begins with a minus sign, the value resulting from the conversion is negated (in the return type). A pointer to the final string is stored in the object pointed to by /endptr/, provided that /endptr/ is not a null pointer.
Quoted 4 lines
)
I don't insist though; if Phil is OK with the posted patch, I won't try to block it.
I'm happy either way.
Dave
Quoted 2 lines
Thanks
Laszlo
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 115 lines · Dr. David Alan Gilbert
Quoted 71 lines · * Laszlo Ersek ([email protected]) wrote:
Quoted 23 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Commit
ee5d0f89de3e53cdb0dcadded range checking on reboot-timeout to only allow the range 0..65535; however both qemu and libvirt document the special value -1 to mean don't reboot.
Allow it again.Fixes ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/nvram/fw_cfg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/nvram/fw_cfg.c +0
-0@@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 257
Quoted 10 lines
hw/nvram/fw_cfg.c +3
-2+/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val <-1 || rt_val >0xffff ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }Ouch.
Here's the prototype of
qemu_opt_get_number():Quoted 1 line
uint64_tqemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval);So, when we call it, here's what we actually do:
rt_val = (int64_t)qemu_opt_get_number(opts, "reboot-timeout", (uint64_t)-1); ^^^^^^^^^ ^^^^^^^^^^The conversion to
uint64_tis fine.The conversion to
int64_tis not great:Quoted 3 lines
Otherwise, the new type is signed and the value cannot be represented in it; either the result is implementation-defined or an implementation-defined signal is raised.
I guess we're exploiting two's complement, as the implementation-defined result. Not great. :)
Here's what I'd prefer:
Quoted 12 lines
hw/nvram/fw_cfg.c +1
-1@@ -237,7 +237,7 @@ static void fw_cfg_bootsplash(FWCfgState *s)static void fw_cfg_reboot (FWCfgState *s) {const char *reboot_timeout =NULL ; -int64_t rt_val =-1 ; +uint64_t rt_val =-1 ;uint32_t rt_le32;Quoted 13 lines
hw/nvram/fw_cfg.c static void fw_cfg_reboot(FWCfgState *s) · line 256
Quoted 13 lines
hw/nvram/fw_cfg.c +2
-2/* get user configuration */ @@ -248,9 +248,9 @@ static void fw_cfg_reboot(FWCfgState *s)if (reboot_timeout) { rt_val =qemu_opt_get_number (opts,"reboot-timeout" ,-1 );/* validate the input */ -if (rt_val <0 || rt_val >0xffff ) { +if (rt_val >0xffff && rt_val != (uint64_t )-1 ) {error_report ("reboot timeout is invalid," -"it should be a value between 0 and 65535" ); +"it should be a value between -1 and 65535" );exit (1 ); } }I think I'm fine with that as well; want to add a signed off and post?
Quoted 4 lines
(
The trick is that
strtoull(), inQuoted 8 lines
qemu_opt_get_number() qemu_opt_get_number_helper() parse_option_number() qemu_strtou64() strtoull()turns "-1" into (uint64_t)-1, which counts as a valid conversion, per spec:
It's rather scary how much we rely on the grubby depths of the implementations of our conversion routines.
Quoted 11 lines
Quoted 10 lines
If the subject sequence has the expected form and the value of /base/ is zero, the sequence of characters starting with the first digit is interpreted as an integer constant according to the rules of 6.4.4.1. If the subject sequence has the expected form and the value of /base/ is between 2 and 36, it is used as the base for conversion, ascribing to each letter its value as given above. If the subject sequence begins with a minus sign, the value resulting from the conversion is negated (in the return type). A pointer to the final string is stored in the object pointed to by /endptr/, provided that /endptr/ is not a null pointer.
Quoted 6 lines
Quoted 4 lines
)
I don't insist though; if Phil is OK with the posted patch, I won't try to block it.
I'm happy either way.
Thanks, queued with Laszlo's changes.
Regards,
Phil.