* [PATCH v1] Check and report for incomplete 'global' option format
@ 2022-01-04 13:41 Rohit Kumar
2022-01-04 13:52 ` Philippe Mathieu-Daudé
2022-01-24 14:59 ` Rohit Kumar
0 siblings, 2 replies; 4+ messages in thread
From: Rohit Kumar @ 2022-01-04 13:41 UTC (permalink / raw)
To: qemu-devel; +Cc: prachatos.mitra, Rohit Kumar, prerna.saxena
Qemu might crash when provided incomplete '-global' option.
For example:
qemu-system-x86_64 -global driver=isa-fdc
qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394:
string_input_visitor_new: Assertion `str' failed.
Aborted (core dumped)
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604
Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
---
softmmu/qdev-monitor.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 01f3834db5..7aee7b9882 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -1020,6 +1020,7 @@ int qemu_global_option(const char *str)
char driver[64], property[64];
QemuOpts *opts;
int rc, offset;
+ Error *err = NULL;
rc = sscanf(str, "%63[^.=].%63[^=]%n", driver, property, &offset);
if (rc == 2 && str[offset] == '=') {
@@ -1031,7 +1032,13 @@ int qemu_global_option(const char *str)
}
opts = qemu_opts_parse_noisily(&qemu_global_opts, str, false);
- if (!opts) {
+ if (!opts || !qemu_opt_get(opts, "driver") || !qemu_opt_get(opts, "property") ||
+ !qemu_opt_get(opts, "value")) {
+ error_setg(&err, "Invalid 'global' option format\n"
+ "Expected: -global <driver>.<property>=<value> or "
+ "-global driver=driver,property=property,value=value\n"
+ "Received: -global %s", str);
+ error_report_err(err);
return -1;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v1] Check and report for incomplete 'global' option format
2022-01-04 13:41 [PATCH v1] Check and report for incomplete 'global' option format Rohit Kumar
@ 2022-01-04 13:52 ` Philippe Mathieu-Daudé
2022-01-10 9:46 ` Rohit Kumar
2022-01-24 14:59 ` Rohit Kumar
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-04 13:52 UTC (permalink / raw)
To: Rohit Kumar, qemu-devel
Cc: prachatos.mitra, Thomas Huth, Markus Armbruster, prerna.saxena
Cc'ing Markus / Thomas
On 4/1/22 14:41, Rohit Kumar wrote:
> Qemu might crash when provided incomplete '-global' option.
> For example:
> qemu-system-x86_64 -global driver=isa-fdc
> qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394:
> string_input_visitor_new: Assertion `str' failed.
> Aborted (core dumped)
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604
> Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
> ---
> softmmu/qdev-monitor.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
> index 01f3834db5..7aee7b9882 100644
> --- a/softmmu/qdev-monitor.c
> +++ b/softmmu/qdev-monitor.c
> @@ -1020,6 +1020,7 @@ int qemu_global_option(const char *str)
> char driver[64], property[64];
> QemuOpts *opts;
> int rc, offset;
> + Error *err = NULL;
>
> rc = sscanf(str, "%63[^.=].%63[^=]%n", driver, property, &offset);
> if (rc == 2 && str[offset] == '=') {
> @@ -1031,7 +1032,13 @@ int qemu_global_option(const char *str)
> }
>
> opts = qemu_opts_parse_noisily(&qemu_global_opts, str, false);
> - if (!opts) {
> + if (!opts || !qemu_opt_get(opts, "driver") || !qemu_opt_get(opts, "property") ||
> + !qemu_opt_get(opts, "value")) {
> + error_setg(&err, "Invalid 'global' option format\n"
> + "Expected: -global <driver>.<property>=<value> or "
> + "-global driver=driver,property=property,value=value\n"
> + "Received: -global %s", str);
> + error_report_err(err);
> return -1;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] Check and report for incomplete 'global' option format
2022-01-04 13:52 ` Philippe Mathieu-Daudé
@ 2022-01-10 9:46 ` Rohit Kumar
0 siblings, 0 replies; 4+ messages in thread
From: Rohit Kumar @ 2022-01-10 9:46 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: prachatos.mitra, Thomas Huth, Markus Armbruster, prerna.saxena
Ping. Please take a look at this patch.
Link: https://lists.nongnu.org/archive/html/qemu-devel/2022-01/msg00296.html
On 04/01/22 7:22 pm, Philippe Mathieu-Daudé wrote:
> Cc'ing Markus / Thomas
>
> On 4/1/22 14:41, Rohit Kumar wrote:
>> Qemu might crash when provided incomplete '-global' option.
>> For example:
>> qemu-system-x86_64 -global driver=isa-fdc
>> qemu-system-x86_64:
>> ../../devel/qemu/qapi/string-input-visitor.c:394:
>> string_input_visitor_new: Assertion `str' failed.
>> Aborted (core dumped)
>>
>> Resolves:
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__gitlab.com_qemu-2Dproject_qemu_-2D_issues_604&d=DwICaQ&c=s883GpUCOChKOHiocYtGcg&r=ABSkr7gy7ZTfApFfI-Xxt1gZNtsDDiXoXOXc0OrkyFs&m=D981HXzQDqFNmq9tQqGqTedyzdOsi9F2fju4ltYq8HjOwS9Le2sJAgk09AWgxQg-&s=AGQxOHDyd9OPvXiP4hHLIb4FptkdlQFHDf2Xtadueo0&e=
>> Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
>> ---
>> softmmu/qdev-monitor.c | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
>> index 01f3834db5..7aee7b9882 100644
>> --- a/softmmu/qdev-monitor.c
>> +++ b/softmmu/qdev-monitor.c
>> @@ -1020,6 +1020,7 @@ int qemu_global_option(const char *str)
>> char driver[64], property[64];
>> QemuOpts *opts;
>> int rc, offset;
>> + Error *err = NULL;
>> rc = sscanf(str, "%63[^.=].%63[^=]%n", driver, property,
>> &offset);
>> if (rc == 2 && str[offset] == '=') {
>> @@ -1031,7 +1032,13 @@ int qemu_global_option(const char *str)
>> }
>> opts = qemu_opts_parse_noisily(&qemu_global_opts, str, false);
>> - if (!opts) {
>> + if (!opts || !qemu_opt_get(opts, "driver") ||
>> !qemu_opt_get(opts, "property") ||
>> + !qemu_opt_get(opts, "value")) {
>> + error_setg(&err, "Invalid 'global' option format\n"
>> + "Expected: -global <driver>.<property>=<value> or "
>> + "-global
>> driver=driver,property=property,value=value\n"
>> + "Received: -global %s", str);
>> + error_report_err(err);
>> return -1;
>> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] Check and report for incomplete 'global' option format
2022-01-04 13:41 [PATCH v1] Check and report for incomplete 'global' option format Rohit Kumar
2022-01-04 13:52 ` Philippe Mathieu-Daudé
@ 2022-01-24 14:59 ` Rohit Kumar
1 sibling, 0 replies; 4+ messages in thread
From: Rohit Kumar @ 2022-01-24 14:59 UTC (permalink / raw)
To: qemu-devel; +Cc: prachatos.mitra, Thomas Huth, Markus Armbruster, prerna.saxena
Ping.
Hi, please review this patch.
Link: https://lists.nongnu.org/archive/html/qemu-devel/2022-01/msg00296.html
Thanks !
On 04/01/22 7:11 pm, Rohit Kumar wrote:
> Qemu might crash when provided incomplete '-global' option.
> For example:
> qemu-system-x86_64 -global driver=isa-fdc
> qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394:
> string_input_visitor_new: Assertion `str' failed.
> Aborted (core dumped)
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604
> Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
> ---
> softmmu/qdev-monitor.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
> index 01f3834db5..7aee7b9882 100644
> --- a/softmmu/qdev-monitor.c
> +++ b/softmmu/qdev-monitor.c
> @@ -1020,6 +1020,7 @@ int qemu_global_option(const char *str)
> char driver[64], property[64];
> QemuOpts *opts;
> int rc, offset;
> + Error *err = NULL;
>
> rc = sscanf(str, "%63[^.=].%63[^=]%n", driver, property, &offset);
> if (rc == 2 && str[offset] == '=') {
> @@ -1031,7 +1032,13 @@ int qemu_global_option(const char *str)
> }
>
> opts = qemu_opts_parse_noisily(&qemu_global_opts, str, false);
> - if (!opts) {
> + if (!opts || !qemu_opt_get(opts, "driver") || !qemu_opt_get(opts, "property") ||
> + !qemu_opt_get(opts, "value")) {
> + error_setg(&err, "Invalid 'global' option format\n"
> + "Expected: -global <driver>.<property>=<value> or "
> + "-global driver=driver,property=property,value=value\n"
> + "Received: -global %s", str);
> + error_report_err(err);
> return -1;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-24 15:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-04 13:41 [PATCH v1] Check and report for incomplete 'global' option format Rohit Kumar
2022-01-04 13:52 ` Philippe Mathieu-Daudé
2022-01-10 9:46 ` Rohit Kumar
2022-01-24 14:59 ` Rohit Kumar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.