* [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 3:45 ` Eduardo Habkost
0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Habkost @ 2019-04-18 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Cleber Rosa, Igor Mammedov
Fix the following crash:
$ qemu-system-x86_64 -cpu ''
qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
Assertion `cpu_model && cc->class_by_name' failed.
Regression test script included.
Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
exec.c | 4 ++++
tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 tests/acceptance/empty_cpu_model.py
diff --git a/exec.c b/exec.c
index 1ca95df9d8..d816b38863 100644
--- a/exec.c
+++ b/exec.c
@@ -999,6 +999,10 @@ const char *parse_cpu_option(MachineState *machine, const char *cpu_option)
const char *cpu_type;
model_pieces = g_strsplit(cpu_option, ",", 2);
+ if (!model_pieces[0]) {
+ error_report("-cpu option cannot be empty");
+ exit(1);
+ }
cc = lookup_cpu_class(model_pieces[0], &error_fatal);
cpu_type = object_class_get_name(OBJECT_CLASS(cc));
diff --git a/tests/acceptance/empty_cpu_model.py b/tests/acceptance/empty_cpu_model.py
new file mode 100644
index 0000000000..3f4f663582
--- /dev/null
+++ b/tests/acceptance/empty_cpu_model.py
@@ -0,0 +1,19 @@
+# Check for crash when using empty -cpu option
+#
+# Copyright (c) 2019 Red Hat, Inc.
+#
+# Author:
+# Eduardo Habkost <ehabkost@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+import subprocess
+from avocado_qemu import Test
+
+class EmptyCPUModel(Test):
+ def test(self):
+ cmd = [self.qemu_bin, '-S', '-display', 'none', '-machine', 'none', '-cpu', '']
+ r = subprocess.run(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ self.assertEquals(r.returncode, 1, "QEMU exit code should be 1")
+ self.assertEquals(r.stdout, b'', "QEMU stdout should be empty")
+ self.assertNotEquals(r.stderr, b'', "QEMU stderr shouldn't be empty")
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 3:45 ` Eduardo Habkost
0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Habkost @ 2019-04-18 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: Igor Mammedov, Cleber Rosa
Fix the following crash:
$ qemu-system-x86_64 -cpu ''
qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
Assertion `cpu_model && cc->class_by_name' failed.
Regression test script included.
Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
exec.c | 4 ++++
tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 tests/acceptance/empty_cpu_model.py
diff --git a/exec.c b/exec.c
index 1ca95df9d8..d816b38863 100644
--- a/exec.c
+++ b/exec.c
@@ -999,6 +999,10 @@ const char *parse_cpu_option(MachineState *machine, const char *cpu_option)
const char *cpu_type;
model_pieces = g_strsplit(cpu_option, ",", 2);
+ if (!model_pieces[0]) {
+ error_report("-cpu option cannot be empty");
+ exit(1);
+ }
cc = lookup_cpu_class(model_pieces[0], &error_fatal);
cpu_type = object_class_get_name(OBJECT_CLASS(cc));
diff --git a/tests/acceptance/empty_cpu_model.py b/tests/acceptance/empty_cpu_model.py
new file mode 100644
index 0000000000..3f4f663582
--- /dev/null
+++ b/tests/acceptance/empty_cpu_model.py
@@ -0,0 +1,19 @@
+# Check for crash when using empty -cpu option
+#
+# Copyright (c) 2019 Red Hat, Inc.
+#
+# Author:
+# Eduardo Habkost <ehabkost@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+import subprocess
+from avocado_qemu import Test
+
+class EmptyCPUModel(Test):
+ def test(self):
+ cmd = [self.qemu_bin, '-S', '-display', 'none', '-machine', 'none', '-cpu', '']
+ r = subprocess.run(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ self.assertEquals(r.returncode, 1, "QEMU exit code should be 1")
+ self.assertEquals(r.stdout, b'', "QEMU stdout should be empty")
+ self.assertNotEquals(r.stderr, b'', "QEMU stderr shouldn't be empty")
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 8:09 ` Stefano Garzarella
0 siblings, 0 replies; 9+ messages in thread
From: Stefano Garzarella @ 2019-04-18 8:09 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Igor Mammedov, Cleber Rosa
On Thu, Apr 18, 2019 at 12:45:01AM -0300, Eduardo Habkost wrote:
> Fix the following crash:
>
> $ qemu-system-x86_64 -cpu ''
> qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> Assertion `cpu_model && cc->class_by_name' failed.
>
> Regression test script included.
>
> Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> exec.c | 4 ++++
> tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
> 2 files changed, 23 insertions(+)
> create mode 100644 tests/acceptance/empty_cpu_model.py
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Tested-by: Stefano Garzarella <sgarzare@redhat.com>
Thanks,
Stefano
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 8:09 ` Stefano Garzarella
0 siblings, 0 replies; 9+ messages in thread
From: Stefano Garzarella @ 2019-04-18 8:09 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: Igor Mammedov, qemu-devel, Cleber Rosa
On Thu, Apr 18, 2019 at 12:45:01AM -0300, Eduardo Habkost wrote:
> Fix the following crash:
>
> $ qemu-system-x86_64 -cpu ''
> qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> Assertion `cpu_model && cc->class_by_name' failed.
>
> Regression test script included.
>
> Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> exec.c | 4 ++++
> tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
> 2 files changed, 23 insertions(+)
> create mode 100644 tests/acceptance/empty_cpu_model.py
>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Tested-by: Stefano Garzarella <sgarzare@redhat.com>
Thanks,
Stefano
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
2019-04-18 3:45 ` Eduardo Habkost
(?)
(?)
@ 2019-04-18 11:22 ` Igor Mammedov
2019-04-18 13:23 ` Eduardo Habkost
-1 siblings, 1 reply; 9+ messages in thread
From: Igor Mammedov @ 2019-04-18 11:22 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Cleber Rosa
On Thu, 18 Apr 2019 00:45:01 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> Fix the following crash:
>
> $ qemu-system-x86_64 -cpu ''
> qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> Assertion `cpu_model && cc->class_by_name' failed.
>
> Regression test script included.
>
> Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> exec.c | 4 ++++
> tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
> 2 files changed, 23 insertions(+)
> create mode 100644 tests/acceptance/empty_cpu_model.py
>
> diff --git a/exec.c b/exec.c
> index 1ca95df9d8..d816b38863 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -999,6 +999,10 @@ const char *parse_cpu_option(MachineState *machine, const char *cpu_option)
> const char *cpu_type;
>
> model_pieces = g_strsplit(cpu_option, ",", 2);
> + if (!model_pieces[0]) {
> + error_report("-cpu option cannot be empty");
> + exit(1);
s/1/EXIT_FAILURE/
> + }
>
> cc = lookup_cpu_class(model_pieces[0], &error_fatal);
> cpu_type = object_class_get_name(OBJECT_CLASS(cc));
> diff --git a/tests/acceptance/empty_cpu_model.py b/tests/acceptance/empty_cpu_model.py
> new file mode 100644
> index 0000000000..3f4f663582
> --- /dev/null
> +++ b/tests/acceptance/empty_cpu_model.py
> @@ -0,0 +1,19 @@
> +# Check for crash when using empty -cpu option
> +#
> +# Copyright (c) 2019 Red Hat, Inc.
> +#
> +# Author:
> +# Eduardo Habkost <ehabkost@redhat.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2 or
> +# later. See the COPYING file in the top-level directory.
> +import subprocess
> +from avocado_qemu import Test
> +
> +class EmptyCPUModel(Test):
> + def test(self):
> + cmd = [self.qemu_bin, '-S', '-display', 'none', '-machine', 'none', '-cpu', '']
> + r = subprocess.run(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
> + self.assertEquals(r.returncode, 1, "QEMU exit code should be 1")
> + self.assertEquals(r.stdout, b'', "QEMU stdout should be empty")
> + self.assertNotEquals(r.stderr, b'', "QEMU stderr shouldn't be empty")
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
2019-04-18 11:22 ` Igor Mammedov
@ 2019-04-18 13:23 ` Eduardo Habkost
2019-04-18 15:05 ` Igor Mammedov
0 siblings, 1 reply; 9+ messages in thread
From: Eduardo Habkost @ 2019-04-18 13:23 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, Cleber Rosa
On Thu, Apr 18, 2019 at 01:22:16PM +0200, Igor Mammedov wrote:
> On Thu, 18 Apr 2019 00:45:01 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > Fix the following crash:
> >
> > $ qemu-system-x86_64 -cpu ''
> > qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> > Assertion `cpu_model && cc->class_by_name' failed.
> >
> > Regression test script included.
> >
> > Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> > exec.c | 4 ++++
> > tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
> > 2 files changed, 23 insertions(+)
> > create mode 100644 tests/acceptance/empty_cpu_model.py
> >
> > diff --git a/exec.c b/exec.c
> > index 1ca95df9d8..d816b38863 100644
> > --- a/exec.c
> > +++ b/exec.c
> > @@ -999,6 +999,10 @@ const char *parse_cpu_option(MachineState *machine, const char *cpu_option)
> > const char *cpu_type;
> >
> > model_pieces = g_strsplit(cpu_option, ",", 2);
> > + if (!model_pieces[0]) {
> > + error_report("-cpu option cannot be empty");
> > + exit(1);
>
> s/1/EXIT_FAILURE/
Why?
There are 753 instances of "exit(1)" in the tree, and 171
instances of "exit(EXIT_FAILURE)".
--
Eduardo
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
2019-04-18 13:23 ` Eduardo Habkost
@ 2019-04-18 15:05 ` Igor Mammedov
0 siblings, 0 replies; 9+ messages in thread
From: Igor Mammedov @ 2019-04-18 15:05 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Cleber Rosa
On Thu, 18 Apr 2019 10:23:29 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Thu, Apr 18, 2019 at 01:22:16PM +0200, Igor Mammedov wrote:
> > On Thu, 18 Apr 2019 00:45:01 -0300
> > Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > > Fix the following crash:
> > >
> > > $ qemu-system-x86_64 -cpu ''
> > > qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> > > Assertion `cpu_model && cc->class_by_name' failed.
> > >
> > > Regression test script included.
> > >
> > > Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > > ---
> > > exec.c | 4 ++++
> > > tests/acceptance/empty_cpu_model.py | 19 +++++++++++++++++++
> > > 2 files changed, 23 insertions(+)
> > > create mode 100644 tests/acceptance/empty_cpu_model.py
> > >
> > > diff --git a/exec.c b/exec.c
> > > index 1ca95df9d8..d816b38863 100644
> > > --- a/exec.c
> > > +++ b/exec.c
> > > @@ -999,6 +999,10 @@ const char *parse_cpu_option(MachineState *machine, const char *cpu_option)
> > > const char *cpu_type;
> > >
> > > model_pieces = g_strsplit(cpu_option, ",", 2);
> > > + if (!model_pieces[0]) {
> > > + error_report("-cpu option cannot be empty");
> > > + exit(1);
> >
> > s/1/EXIT_FAILURE/
>
> Why?
it's more descriptive in general
> There are 753 instances of "exit(1)" in the tree, and 171
> instances of "exit(EXIT_FAILURE)".
Bad example in past is probably not a good justification,
especially when adding new code (but I'm not going to argue about it).
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 20:16 ` Eduardo Habkost
0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Habkost @ 2019-04-18 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Cleber Rosa, Igor Mammedov
On Thu, Apr 18, 2019 at 12:45:01AM -0300, Eduardo Habkost wrote:
> Fix the following crash:
>
> $ qemu-system-x86_64 -cpu ''
> qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> Assertion `cpu_model && cc->class_by_name' failed.
>
> Regression test script included.
>
> Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Queued on machine-next.
--
Eduardo
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option
@ 2019-04-18 20:16 ` Eduardo Habkost
0 siblings, 0 replies; 9+ messages in thread
From: Eduardo Habkost @ 2019-04-18 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Igor Mammedov, Cleber Rosa
On Thu, Apr 18, 2019 at 12:45:01AM -0300, Eduardo Habkost wrote:
> Fix the following crash:
>
> $ qemu-system-x86_64 -cpu ''
> qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
> Assertion `cpu_model && cc->class_by_name' failed.
>
> Regression test script included.
>
> Fixes: commit 99193d8f2ef5 ("cpu: drop unnecessary NULL check and cpu_common_class_by_name()")
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Queued on machine-next.
--
Eduardo
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-04-18 20:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-18 3:45 [Qemu-devel] [PATCH] cpu: Fix crash with empty -cpu option Eduardo Habkost
2019-04-18 3:45 ` Eduardo Habkost
2019-04-18 8:09 ` Stefano Garzarella
2019-04-18 8:09 ` Stefano Garzarella
2019-04-18 11:22 ` Igor Mammedov
2019-04-18 13:23 ` Eduardo Habkost
2019-04-18 15:05 ` Igor Mammedov
2019-04-18 20:16 ` Eduardo Habkost
2019-04-18 20:16 ` Eduardo Habkost
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.